From patchwork Tue May 21 09:45:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 798021 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E6EA6A8AD for ; Tue, 21 May 2024 09:45:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284730; cv=none; b=FFWtLIBdYMzR2pXTl86HTDnvkvlytFTBV+4l6vop9c82q2/sE41crzJILoRkCUTmwZb385C4J9yqqe6rk2iPNSzK62rku7u2zAhrV8PHZSmoEN9uM9nSBJS8ean5F0sDq8KhNbwd2i6PVRtShHFpW4DxMb5Ztkig0r+FBb+BUjg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284730; c=relaxed/simple; bh=93C6VdWrKA3F4L2pbTvmlVsMwuAb+l57jMfHeI9flc8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NW85ARshEZLoqzQ9xVDDBzOKLlKWHMBBCCHADyUA8cUBQVvlHG5f7090+JTtqFpBBiyJnaSz7MmHxzzDlwf7PzmWlLgaYzFK/UgCAkjArM3/NOEbu67tsessTqxRuE/Kl9o0B62fn4t0BBDscvyA2CF4DENK4G1K0z2MS4J0tA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Xvx6a4lH; arc=none smtp.client-ip=209.85.208.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Xvx6a4lH" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2e271acb015so66756451fa.1 for ; Tue, 21 May 2024 02:45:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716284726; x=1716889526; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=A25lOkPAYIem0QXdhyIts7q0LCcqMUXPkolw5JT6tE8=; b=Xvx6a4lH314okQqJ9pylwxi4TIrQKSzwBTkck4zwg4T41DQWbw9IDxwzmA75eoVE2E 5RmiAF4uhOnxx2/OpQcDNenWfx8cwBNxwZTLMTRunMlvnK16MlQzaJsq/g2jSgiIbKul ylRbCznYVyTwou2m6XCce7y+o/MauvIUr6vlRb6XleH5rJvhf7vAbc8AYRu5BV2jqp64 SsSw2rBm5XqukLia+jqMG3NLaV3inaKhxslpFInB/mhsKSFs9S5iabrJ2/SxGlfQ4ENW DfEzyzpftRYCynI96Ce/O/2JygDHA7aRl/P631s/h7X49NMLra0OAW5makMYpUu+NJsN XjEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716284726; x=1716889526; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A25lOkPAYIem0QXdhyIts7q0LCcqMUXPkolw5JT6tE8=; b=IBlQlyFS15ot1PHtIy3f0/Hf/au+3On2N7s+ef9oiJmxUVJ1orQFIw32f3+ihmI4Gu wywZH7FR2vlsMQItQpldaaHiLqm1JqqA7gcuX6rh3yJZ+JcMaji+0dd4HelSQ8BEh1iz vNRhfOX8gu/4rT0UaOmyIguwnx0gOj5D70SE5pFh0DIxQMwic+JYtZRcvSsAwkVXtWMu ZoHx3dvwxlt4Jc72XKxfHuRxyoBbnZKWx94raPgFcSp7ySOVokogP1g5droSK//Ir07+ 6zxACoW2SVvVlK7y1+HPgY7Iji1Ny6smp4Bb/2HC06I1AdEWLhMQRYmJJx0NGeBNvYy9 IKVA== X-Forwarded-Encrypted: i=1; AJvYcCVc9z2EQy4MxG7iWZlfwOEb5ETUJKUexbnAZsMNxb7vayW5RnqhqbUgRI2F8J6VOi7LFFuC4NLmRc/18EPv+W+Ppu67T9R6ytysZKYRNQ== X-Gm-Message-State: AOJu0YxK+I7JpUuqZicjGgJgA15irE4jqMl8zsjdF2F6Vh88fdZpDpJk k10pSSAK93NrffJqC4xtv+w49RVuRdJS8/g1LZchCkm1P1cn2ZneANBH+CrxyfM= X-Google-Smtp-Source: AGHT+IEAWe28pTg85AhhLUeeo7JJ7lfVb04BZMvFFnep7DU1veqKcLN+AogT8YrMcOrIFXgcishk6Q== X-Received: by 2002:a2e:9053:0:b0:2e7:bc7:b6ea with SMTP id 38308e7fff4ca-2e70bc7b72fmr75487961fa.14.1716284726753; Tue, 21 May 2024 02:45:26 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e706ee0a65sm13906261fa.112.2024.05.21.02.45.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 02:45:26 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 21 May 2024 12:45:22 +0300 Subject: [PATCH 02/12] wifi: wcn36xx: make use of QCOM_FW_HELPER Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240521-qcom-firmware-name-v1-2-99a6d32b1e5e@linaro.org> References: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> In-Reply-To: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Loic Poulain , Kalle Valo , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, Arnd Bergmann , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1730; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=93C6VdWrKA3F4L2pbTvmlVsMwuAb+l57jMfHeI9flc8=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ5pPrhGrlNQyruXtrrrFAV5mO7lzjzx0qWr/6p8ZZcok6 9XmGN3JaMzCwMjFICumyOJT0DI1ZlNy2IcdU+thBrEygUxh4OIUgIkkX2b/w3lVbFHDvhj1dTx5 zJ9idwhd+1Gr82OL/L5D4j5l77dIbV+ktCJm2Xx91oh63TtRWqrV1pV3kitkelPOGvdudGI1fP5 mR6/o3Aie5c9Kt3XPl8j6b7NDzlbveJsmb+5kX+X/vo7XLIR1d12X+e9Q3L9tsoTMlAuqnya+N2 1uiK8+Hsaq0prWs4E/drVY9hTRnamP9gV/npM+W2bHBYVFl3O6E6Yd6zqx0Smq+9a+D9+Fjfc// rhqzrzm559yZu/esGfzwj3iOsusG2WtDRSFGR6r68v8jfhW5HPWNquGhVlQycyZwWv//Uu+Rha3 TPJEthr4K2r21UfUvO7tMjqmdKX7h/V2vSOWq9V5mp0B X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Make the driver use qcom_fw_helper to autodetect the path to the calibration data file. Signed-off-by: Dmitry Baryshkov --- drivers/net/wireless/ath/wcn36xx/Kconfig | 1 + drivers/net/wireless/ath/wcn36xx/main.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/wireless/ath/wcn36xx/Kconfig b/drivers/net/wireless/ath/wcn36xx/Kconfig index 5832c7ef9352..90239c89676a 100644 --- a/drivers/net/wireless/ath/wcn36xx/Kconfig +++ b/drivers/net/wireless/ath/wcn36xx/Kconfig @@ -4,6 +4,7 @@ config WCN36XX depends on MAC80211 && HAS_DMA depends on QCOM_WCNSS_CTRL || QCOM_WCNSS_CTRL=n depends on RPMSG || RPMSG=n + select QCOM_FW_HELPER help This module adds support for wireless adapters based on Qualcomm Atheros WCN3660 and WCN3680 mobile chipsets. diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index e760d8002e09..8d25db81c1d0 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -1609,6 +1610,10 @@ static int wcn36xx_probe(struct platform_device *pdev) goto out_wq; } + wcn->nv_file = devm_qcom_get_board_fw(wcn->dev, wcn->nv_file); + if (!wcn->nv_file) + return -ENOMEM; + wcn->smd_channel = qcom_wcnss_open_channel(wcnss, "WLAN_CTRL", wcn36xx_smd_rsp_process, hw); if (IS_ERR(wcn->smd_channel)) { wcn36xx_err("failed to open WLAN_CTRL channel\n"); From patchwork Tue May 21 09:45:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 798020 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBC636CDA3 for ; Tue, 21 May 2024 09:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284732; cv=none; b=Wu9wAbqKP/RgPJv7X2JP0Wjb8aHjHKXMMiA3Yu/nQ9bX+R8WQ8EuZ1ykpG+uXMBSjQpLYxqA4jhwyMAbkDl1nNBrkE4YEs+tVpWaSVFtGL5pBhCekmb4Ma6mj7prjpgUeq8E9wWP1SzETBoA2qpRXhEkWCcnP/JZoWWJxdzMV7s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284732; c=relaxed/simple; bh=cXnQhU7DTsaHUnDJalMnIg7XjAg9iNbwZVjIZgmeSpk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e2h6ls+T4uw+KlJn+BoWaZMjP+rRzEW5MDQWvoI9tCwY9nDD/xULw2YpPypZCCwfrql2HBrT/0SzZ/bAOWOJN6O+LCxheTk5VU489tZO+0J3l1zEU++Gqrgkd7PSw4GBHXyY35C9w8eWOGdS6wbT4JaMAdtz7QtUDYzYi9Yhnqc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=c6L9dSyJ; arc=none smtp.client-ip=209.85.208.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="c6L9dSyJ" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2e3fa13f018so46775311fa.3 for ; Tue, 21 May 2024 02:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716284728; x=1716889528; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=sgcASYNTvkFLrMGDS2Eu8AcYhISRnJlaNxwD2bJ6AP0=; b=c6L9dSyJ0UDxhzPY2s7LGjyxjVKc6BcWwK6HFJjAcN1G5cKYLLPjdDFjqYUOWPO1T0 aXyTYCCSGy1YQw/PSsBtir8M/sPenBPFD/bAGPZJDxLgWHvsf837Bqi3RKDVDmMBflTz f1mPgAi5c1jwoibA/oKPeThGvtXc4lWVR5VpFb0UMXir9EyteAelKsNYvFVxT7H3QWmY oD8gEHqpAlRxpDlxfYdW15cDaHmws6V1lFrlY2iyH6TLPse/AwBx2ekW8aut7nIWYYib ic4LH+VRzf6YZtH143hmUzPcYWDb6005vQN8ibnN/PoG0g+JarV9B7vFBOfc3qV5CON+ a5+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716284728; x=1716889528; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sgcASYNTvkFLrMGDS2Eu8AcYhISRnJlaNxwD2bJ6AP0=; b=OXe+e+IDIVsnu012sIf4nDRCmAWzVEhezt0I7LC95GziXvz+PqzRvfUjyS+1AaNR5G PJvC2DE4CJFChdz9IQew43Tqig9JOROze3JknKn0U74QNlRE9RLdPcO2GKGx7enPpBTp ToTXgDBKcKRldFCa8PE0O05BzUuffeEdmHBTM9BKTivT19MiulqtUFu+EUodLEpM87eJ Y3Vjk5kRrIiydkvnATzbd0vZYURe7nSmSliD+8fhbdko4LG21K/7pGEHHPoJxAtLjdBF LxOGvSWKlwfQBB9f5dtZX6wSIHxJrQX83yFEbDJb/Waexityrlb1ZE98LboQYa24juEP odcg== X-Forwarded-Encrypted: i=1; AJvYcCWvQ6Evs9VQpk42UBTH7G3ELxujazUKT3mtaombbjPEC5Ny4aerYiDUDeHxaalHjvjR7o8iqGhniZ/Ylcr5d6Sg2+cJkQPJj0xtJW4jFg== X-Gm-Message-State: AOJu0Yw5myMwsHGLmrbRuYPS6866mcH+hSEABICfOS+l+xEXfIEdxW09 n2Ufknb3Y0fcx6wIRLUEZa3Bf9R2hj/DFMSS6ZurL+5d+neHEil2vHslR4PFQqY= X-Google-Smtp-Source: AGHT+IH+yWZDlb8bLS8nPxgS1saOotk0gFOAEFagqvE8965Yk3oeS5tWeCYbJp5/QyV9ROS9rcHYXg== X-Received: by 2002:a2e:7a19:0:b0:2e7:2a95:a735 with SMTP id 38308e7fff4ca-2e72a95b39emr30334991fa.0.1716284728093; Tue, 21 May 2024 02:45:28 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e706ee0a65sm13906261fa.112.2024.05.21.02.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 02:45:27 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 21 May 2024 12:45:24 +0300 Subject: [PATCH 04/12] remoteproc: qcom_q6v5_mss: switch to mbn files by default Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240521-qcom-firmware-name-v1-4-99a6d32b1e5e@linaro.org> References: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> In-Reply-To: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Loic Poulain , Kalle Valo , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, Arnd Bergmann , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=968; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=cXnQhU7DTsaHUnDJalMnIg7XjAg9iNbwZVjIZgmeSpk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmTG0z325iTl+oMn1NQPrPRQ4Q6ZS6i5lCSsDT8 POtLZsdzk6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZkxtMwAKCRCLPIo+Aiko 1Qx4B/9aFjIwgs7dL0sZ1cXYFdsxgqusHx8lV3ee+k6wrcZ50Tk67GjspFGGFf+/SurH08Rlaor P1exT5p9sVRAW5FCra4CzBSV/8p4CoSitkEeo4b7DxhOWrXhN73ATE0JLeoqzTwvlsrIORsRyS5 msC4jvfGmotWUr0mO/PbNY/cd4liaPOroxtECb2WF2eD7Dl91sYIonLL5f+I0NPJ0HL1/VXrShX cVLekJ/MtRuH8QjUxdC11CEpTNb8CWasj9+ltZbCjrNuQ5GOB3igW0r+MScMpyoIJQ8jNi+3onS DzH9oZmFQ4Fmx1ogoh9B0Ix2gxcm642ftyqgoPEQoOwegcvo X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A We have been pushing userspace to use mbn files by default for ages. As a preparation for making the firmware-name optional, make the driver use .mbn instead of .mdt files by default. Signed-off-by: Dmitry Baryshkov --- drivers/remoteproc/qcom_q6v5_mss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 1779fc890e10..eeaae2505352 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -2003,7 +2003,7 @@ static int q6v5_probe(struct platform_device *pdev) qproc = rproc->priv; qproc->dev = &pdev->dev; qproc->rproc = rproc; - qproc->hexagon_mdt_image = "modem.mdt"; + qproc->hexagon_mdt_image = "modem.mbn"; ret = of_property_read_string_index(pdev->dev.of_node, "firmware-name", 1, &qproc->hexagon_mdt_image); if (ret < 0 && ret != -EINVAL) { From patchwork Tue May 21 09:45:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 798019 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 696D871757 for ; Tue, 21 May 2024 09:45:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284734; cv=none; b=n2nR1Mk1qB5OFCOiFTX1+v4i6eS0PYiGgotHbZUxbspQKgZKGpUU8sYbc8DKV2loMzmk8r4vWMETMzt9ky206CfdzAZT6P1h6bU+HglTKeynqOdb5i3S5NjFTlMCdbUV7qnlB8VubXIY7TnmRdT53RvtSltQTQuuZBL8ZYX9vII= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284734; c=relaxed/simple; bh=3GMSFXyN5ilu4SqpHge+aFL3zkwzk7yL0BcyJB6jSAk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JMtmaZJ14c+jtfjvo3CBdpKpTygdVuY4oZBZGF0nXd62J6QIC4bwTEFos2rCKAH5E1jXuN2BYZdhWVXeu7dSutWVMJtV9zR+aQPMdq459Ir5WfqSxqNJdt7h4OtjYFXIaK/ErNj01ClKvgWKAKVxXG4Yw3wNebDm4DEVnYwQqA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=S+EHt4L3; arc=none smtp.client-ip=209.85.208.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="S+EHt4L3" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2e73359b8fbso15562631fa.2 for ; Tue, 21 May 2024 02:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716284729; x=1716889529; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=cIq/k/IeC60qZbvt7sKK/1GOc3t+5RIB9rwIXTiRrZ8=; b=S+EHt4L34umNNqJHGRPfejgWBFW6X733iAtImHkC+W82Zhev78I7Ha1LJ8QTjh83l+ 5uCvb2RbHbTuMd40P/72RlqgzO55nwnE4auxW2c7K/9vlmbkBK/b5h0otEOcCMQil1QC haTU8mmxlQOYMYTduv1hzyHSigucoXdC+gs9duKyeLnk3CVpOcei5v9IF5FLeL8yU2LX taMcHFUFi1AXdfre5ujEKg1ZayPWyuQ8L9qgdNcdOuEeTY8u7Hp0sbl9DiVdlKLJRfgr dlUPfpRM1dhsI0NczwRRaD0BlPX+J+/vdMURcjDiO6/JAGHXUG9hx52Xu+RwzwNNFg7z FzTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716284729; x=1716889529; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cIq/k/IeC60qZbvt7sKK/1GOc3t+5RIB9rwIXTiRrZ8=; b=Va1BkOJ//Q/7OFdYWblD1gnu7A4nGF51aPdPvWPLbhKwPUIdLLBFnqssb+oekQYEzJ KVo1xWbKCF0WUIFc25qM+PdfS0W3M65Ya65l1arPel6H/AjPTzBwNMcHUqGW1zMjNLF/ fT5o60aeyhVvn1hkqFnRXirUN3xbVm8g/wH7NImgwfH/nmFAPlITmDvtmbU7B3CZ5MaE YOAQ0YMXzgAoDbiwk8NearfvZX2gdykYZgnfySIIT2Ka1+vbjGPvRFuar1mci8k6Lavj UZQzOEdaX184j+HBRS2vyEcWudf9Xx5GCNYlpf8I+/oRYVXdkquHplC+/qcKY6IS2JQa IV6A== X-Forwarded-Encrypted: i=1; AJvYcCUviTz+8zAD9yeU88ZNbRv8RSkRbPU1MfaRHmanD+PovwTT9/NXKQAPeZ4EcIzZjTJUr6YjwmkkOqA9/cPSQQz38SewzSvrUiHnxWN2tw== X-Gm-Message-State: AOJu0YzubKpIKWLxDWkyIXrsRwOupfl3diHl+OAn+bJvRZeCfuC/Rr28 N339UL4WHHasLJONvto+NOCY1KcXiZW1db+K+/TCqAxkxOYpO30GrUcGK4f0Rnwvu9oMK1pMihg l X-Google-Smtp-Source: AGHT+IEKa17r23iQKv2XCAX0BvXMw/CFrDizcCAluTCl+f1X45ThXZiwZbDwMMNPQaw/SpE9aBJK5A== X-Received: by 2002:a2e:a98d:0:b0:2dd:cb34:ddbc with SMTP id 38308e7fff4ca-2e5205c8fc4mr346995051fa.48.1716284729715; Tue, 21 May 2024 02:45:29 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e706ee0a65sm13906261fa.112.2024.05.21.02.45.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 02:45:29 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 21 May 2024 12:45:26 +0300 Subject: [PATCH 06/12] remoteproc: qcom_q6v5_pas: switch to mbn files by default Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240521-qcom-firmware-name-v1-6-99a6d32b1e5e@linaro.org> References: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> In-Reply-To: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Loic Poulain , Kalle Valo , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, Arnd Bergmann , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=10421; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=3GMSFXyN5ilu4SqpHge+aFL3zkwzk7yL0BcyJB6jSAk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmTG0zpMk5r9LDAbiXaAl3+dyLkGHHAYS+fYqa4 8Y/ZWNFgpGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZkxtMwAKCRCLPIo+Aiko 1crYCACvwdcoc2mokea78aIQPXX1+SXGckOyXSENXcp1uX+WshgqbPy5srU10vhEu2s3Sc2E81T j+3C5Bib57Z1xdUNrEumkpy9BpTieY4WaECHo7fF5R3eF96TuaahK7VQM8gEWaFh5RFdiQeO4w9 gV6ZpGSfdzW5Acs+oJGmPBCgb7vu/GltAV/bVo84tl+bP9ZwIj+D8f7Ts1p21Vwsx+v9EIRzSJM w2Q38ct0DR2QpCRD+z0j1Pebx6lnPFwrsMDhT+BKLaxoWFJ92/TxgFq6RrbEp6ajqIExf0loCzI v7fqVN2B+G3ijH4tC2DrDNfXm3OkEGgOtmH13dlNKw479pFw X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A We have been pushing userspace to use mbn files by default for ages. As a preparation for making the firmware-name optional, make the driver use .mbn instead of .mdt files by default. Signed-off-by: Dmitry Baryshkov --- drivers/remoteproc/qcom_q6v5_pas.c | 76 +++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 54d8005d40a3..4694ec4f038d 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -812,7 +812,7 @@ static void adsp_remove(struct platform_device *pdev) static const struct adsp_data adsp_resource_init = { .crash_reason_smem = 423, - .firmware_name = "adsp.mdt", + .firmware_name = "adsp.mbn", .pas_id = 1, .auto_boot = true, .ssr_name = "lpass", @@ -822,7 +822,7 @@ static const struct adsp_data adsp_resource_init = { static const struct adsp_data sdm845_adsp_resource_init = { .crash_reason_smem = 423, - .firmware_name = "adsp.mdt", + .firmware_name = "adsp.mbn", .pas_id = 1, .auto_boot = true, .load_state = "adsp", @@ -833,7 +833,7 @@ static const struct adsp_data sdm845_adsp_resource_init = { static const struct adsp_data sm6350_adsp_resource = { .crash_reason_smem = 423, - .firmware_name = "adsp.mdt", + .firmware_name = "adsp.mbn", .pas_id = 1, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -849,7 +849,7 @@ static const struct adsp_data sm6350_adsp_resource = { static const struct adsp_data sm6375_mpss_resource = { .crash_reason_smem = 421, - .firmware_name = "modem.mdt", + .firmware_name = "modem.mbn", .pas_id = 4, .minidump_id = 3, .auto_boot = false, @@ -864,7 +864,7 @@ static const struct adsp_data sm6375_mpss_resource = { static const struct adsp_data sm8150_adsp_resource = { .crash_reason_smem = 423, - .firmware_name = "adsp.mdt", + .firmware_name = "adsp.mbn", .pas_id = 1, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -879,7 +879,7 @@ static const struct adsp_data sm8150_adsp_resource = { static const struct adsp_data sm8250_adsp_resource = { .crash_reason_smem = 423, - .firmware_name = "adsp.mdt", + .firmware_name = "adsp.mbn", .pas_id = 1, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -895,7 +895,7 @@ static const struct adsp_data sm8250_adsp_resource = { static const struct adsp_data sm8350_adsp_resource = { .crash_reason_smem = 423, - .firmware_name = "adsp.mdt", + .firmware_name = "adsp.mbn", .pas_id = 1, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -911,7 +911,7 @@ static const struct adsp_data sm8350_adsp_resource = { static const struct adsp_data msm8996_adsp_resource = { .crash_reason_smem = 423, - .firmware_name = "adsp.mdt", + .firmware_name = "adsp.mbn", .pas_id = 1, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -925,7 +925,7 @@ static const struct adsp_data msm8996_adsp_resource = { static const struct adsp_data cdsp_resource_init = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", + .firmware_name = "cdsp.mbn", .pas_id = 18, .auto_boot = true, .ssr_name = "cdsp", @@ -935,7 +935,7 @@ static const struct adsp_data cdsp_resource_init = { static const struct adsp_data sdm845_cdsp_resource_init = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", + .firmware_name = "cdsp.mbn", .pas_id = 18, .auto_boot = true, .load_state = "cdsp", @@ -946,7 +946,7 @@ static const struct adsp_data sdm845_cdsp_resource_init = { static const struct adsp_data sm6350_cdsp_resource = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", + .firmware_name = "cdsp.mbn", .pas_id = 18, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -962,7 +962,7 @@ static const struct adsp_data sm6350_cdsp_resource = { static const struct adsp_data sm8150_cdsp_resource = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", + .firmware_name = "cdsp.mbn", .pas_id = 18, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -977,7 +977,7 @@ static const struct adsp_data sm8150_cdsp_resource = { static const struct adsp_data sm8250_cdsp_resource = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", + .firmware_name = "cdsp.mbn", .pas_id = 18, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -992,7 +992,7 @@ static const struct adsp_data sm8250_cdsp_resource = { static const struct adsp_data sc8280xp_nsp0_resource = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", + .firmware_name = "cdsp.mbn", .pas_id = 18, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -1006,7 +1006,7 @@ static const struct adsp_data sc8280xp_nsp0_resource = { static const struct adsp_data sc8280xp_nsp1_resource = { .crash_reason_smem = 633, - .firmware_name = "cdsp.mdt", + .firmware_name = "cdsp.mbn", .pas_id = 30, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -1020,8 +1020,8 @@ static const struct adsp_data sc8280xp_nsp1_resource = { static const struct adsp_data x1e80100_adsp_resource = { .crash_reason_smem = 423, - .firmware_name = "adsp.mdt", - .dtb_firmware_name = "adsp_dtb.mdt", + .firmware_name = "adsp.mbn", + .dtb_firmware_name = "adsp_dtb.mbn", .pas_id = 1, .dtb_pas_id = 0x24, .lite_pas_id = 0x1f, @@ -1040,8 +1040,8 @@ static const struct adsp_data x1e80100_adsp_resource = { static const struct adsp_data x1e80100_cdsp_resource = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", - .dtb_firmware_name = "cdsp_dtb.mdt", + .firmware_name = "cdsp.mbn", + .dtb_firmware_name = "cdsp_dtb.mbn", .pas_id = 18, .dtb_pas_id = 0x25, .minidump_id = 7, @@ -1060,7 +1060,7 @@ static const struct adsp_data x1e80100_cdsp_resource = { static const struct adsp_data sm8350_cdsp_resource = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", + .firmware_name = "cdsp.mbn", .pas_id = 18, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -1076,7 +1076,7 @@ static const struct adsp_data sm8350_cdsp_resource = { static const struct adsp_data mpss_resource_init = { .crash_reason_smem = 421, - .firmware_name = "modem.mdt", + .firmware_name = "modem.mbn", .pas_id = 4, .minidump_id = 3, .auto_boot = false, @@ -1093,7 +1093,7 @@ static const struct adsp_data mpss_resource_init = { static const struct adsp_data sc8180x_mpss_resource = { .crash_reason_smem = 421, - .firmware_name = "modem.mdt", + .firmware_name = "modem.mbn", .pas_id = 4, .auto_boot = false, .proxy_pd_names = (char*[]){ @@ -1108,7 +1108,7 @@ static const struct adsp_data sc8180x_mpss_resource = { static const struct adsp_data msm8996_slpi_resource_init = { .crash_reason_smem = 424, - .firmware_name = "slpi.mdt", + .firmware_name = "slpi.mbn", .pas_id = 12, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -1122,7 +1122,7 @@ static const struct adsp_data msm8996_slpi_resource_init = { static const struct adsp_data sdm845_slpi_resource_init = { .crash_reason_smem = 424, - .firmware_name = "slpi.mdt", + .firmware_name = "slpi.mbn", .pas_id = 12, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -1138,7 +1138,7 @@ static const struct adsp_data sdm845_slpi_resource_init = { static const struct adsp_data wcss_resource_init = { .crash_reason_smem = 421, - .firmware_name = "wcnss.mdt", + .firmware_name = "wcnss.mbn", .pas_id = 6, .auto_boot = true, .ssr_name = "mpss", @@ -1148,7 +1148,7 @@ static const struct adsp_data wcss_resource_init = { static const struct adsp_data sdx55_mpss_resource = { .crash_reason_smem = 421, - .firmware_name = "modem.mdt", + .firmware_name = "modem.mbn", .pas_id = 4, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -1163,7 +1163,7 @@ static const struct adsp_data sdx55_mpss_resource = { static const struct adsp_data sm8450_mpss_resource = { .crash_reason_smem = 421, - .firmware_name = "modem.mdt", + .firmware_name = "modem.mbn", .pas_id = 4, .minidump_id = 3, .auto_boot = false, @@ -1181,8 +1181,8 @@ static const struct adsp_data sm8450_mpss_resource = { static const struct adsp_data sm8550_adsp_resource = { .crash_reason_smem = 423, - .firmware_name = "adsp.mdt", - .dtb_firmware_name = "adsp_dtb.mdt", + .firmware_name = "adsp.mbn", + .dtb_firmware_name = "adsp_dtb.mbn", .pas_id = 1, .dtb_pas_id = 0x24, .minidump_id = 5, @@ -1200,8 +1200,8 @@ static const struct adsp_data sm8550_adsp_resource = { static const struct adsp_data sm8550_cdsp_resource = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", - .dtb_firmware_name = "cdsp_dtb.mdt", + .firmware_name = "cdsp.mbn", + .dtb_firmware_name = "cdsp_dtb.mbn", .pas_id = 18, .dtb_pas_id = 0x25, .minidump_id = 7, @@ -1220,8 +1220,8 @@ static const struct adsp_data sm8550_cdsp_resource = { static const struct adsp_data sm8550_mpss_resource = { .crash_reason_smem = 421, - .firmware_name = "modem.mdt", - .dtb_firmware_name = "modem_dtb.mdt", + .firmware_name = "modem.mbn", + .dtb_firmware_name = "modem_dtb.mbn", .pas_id = 4, .dtb_pas_id = 0x26, .minidump_id = 3, @@ -1243,7 +1243,7 @@ static const struct adsp_data sm8550_mpss_resource = { static const struct adsp_data sc7280_wpss_resource = { .crash_reason_smem = 626, - .firmware_name = "wpss.mdt", + .firmware_name = "wpss.mbn", .pas_id = 6, .auto_boot = true, .proxy_pd_names = (char*[]){ @@ -1259,8 +1259,8 @@ static const struct adsp_data sc7280_wpss_resource = { static const struct adsp_data sm8650_cdsp_resource = { .crash_reason_smem = 601, - .firmware_name = "cdsp.mdt", - .dtb_firmware_name = "cdsp_dtb.mdt", + .firmware_name = "cdsp.mbn", + .dtb_firmware_name = "cdsp_dtb.mbn", .pas_id = 18, .dtb_pas_id = 0x25, .minidump_id = 7, @@ -1283,8 +1283,8 @@ static const struct adsp_data sm8650_cdsp_resource = { static const struct adsp_data sm8650_mpss_resource = { .crash_reason_smem = 421, - .firmware_name = "modem.mdt", - .dtb_firmware_name = "modem_dtb.mdt", + .firmware_name = "modem.mbn", + .dtb_firmware_name = "modem_dtb.mbn", .pas_id = 4, .dtb_pas_id = 0x26, .minidump_id = 3, From patchwork Tue May 21 09:45:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 798018 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A462B74E3A for ; Tue, 21 May 2024 09:45:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284736; cv=none; b=QHUjq/8ozG+tXUAje96T2RXRTL+lxL7ckvewLJcouGx3yje6RGELCqQrdQ43fOln/9EEb/vu0rLKNq2HPUmpC8qGEL+on8btR66qk8wdmi+tLgVnnrkNm21VmlfzEajEwbu+SLO/vB8j/a2k7tgZfWUr2gdQbGv9LM9j2pO3UII= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284736; c=relaxed/simple; bh=DTUqzTL8iOBwkoam3qEvEmtJacPSZ5s4Txv1FotXGIM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ropl1RetAhS+LQicdfmYzNvlTWcchRGTSD4+Obnlfnkba2TnqVhamC/Br+dFhNdmmfSTU0boVMAhzmWlUkX8lENi37rkPcj4la77BopyfSbJNJUdMr6xLZ8XtxGYTIVAbvaiVrCNiVod06baozSt50d1xfFvUasXlVxKnOlqNB4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=q7ec7037; arc=none smtp.client-ip=209.85.167.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="q7ec7037" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-51ffff16400so8438610e87.2 for ; Tue, 21 May 2024 02:45:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716284732; x=1716889532; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kkVl5ZJEjyZ0695fbPf3rcpNNgNSAt43cde13TvFE68=; b=q7ec7037ALryu7KAdVQjf8KYQzA8dyYT+DvsuxA0Tk/E3aiJR7Aqw6Qgoit2fs0rV0 peOjy0ztep9zXzpnZlXv4rM+uYsuBMZMz0earE4ALvjoAtZK8BRusy1ljBmqVR0b9QFS oYRXGUB9gQbDwAT/nchTtFJqQpDpMm8RNf0j724wwA/7Tfsr7om3rug5U0lwnWYW9s4h sM1BFAWYpQ3eucnbZFdXezFX1EqodVDGyJYelp176BgaIePIP6qaKBWqH0F33/ucUYrE GpQlaL6VnOeodLGWYfeKNX3Xerrh/826pEtjygvqhswQSMWZV9zTzjlbMW1dDSdPyYN0 s28A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716284732; x=1716889532; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kkVl5ZJEjyZ0695fbPf3rcpNNgNSAt43cde13TvFE68=; b=vFl7qGtrapGwgNQknJNlQK24o4ojvX6Bj8TGiM3T9Vd9BQDD3VsYG6H25430Ks1dlK M8fVf90OjzG+PErmXwQ9bjUgWk6YrIaGBzZdvn284DcSRgQUiT3uAeVhJCCFXSg5ZHtj 1PG6Yr6FuatMs6jCP1DgUjq4xU93LN0JaVGA08+2CQDtXjt4uBwuKEnXzzrIOUUEh9NJ /5MPD8ifOsUTzfjcdgFq0vvjk4tDG7E66/bp8F7d6qecDWA/Wq/RW42ZzUZUf2Uu+/DD GV4WLr/tRAEk0xvkv8hNbmZM1Ws0X14VYBRoSbTVl7fGcz34/87Dc+BWpNM3fzPbbRM4 e6wA== X-Forwarded-Encrypted: i=1; AJvYcCWEw/yH9ootWAfOnVsLCIaKRF1PtcAZEaST0TbiYU6mQLrDzzRLcYlWEHN/6dlHXehltW1qWdW1EU+a8TuBOmntAg19EYXMx7p57tTERQ== X-Gm-Message-State: AOJu0Yw3depR91ONLPTOh1dduTrx5ifEH5T8jl6h8E6UxGkeo55F5MjX E+JYAYU9NlLmv3dLz2zDoasekoWopfuDoQEeCRmP/dXzsdqf9pJjpQhyfJ/ub1M= X-Google-Smtp-Source: AGHT+IGXHj/q48fwjhKVjn6sQaXvNT14JJ/1socCkYTz1ppWvArZgaQu0LAF3z1CSYykJeMGq2xw4Q== X-Received: by 2002:a05:651c:149:b0:2e2:9842:a9d3 with SMTP id 38308e7fff4ca-2e52039dc3emr254963931fa.46.1716284731863; Tue, 21 May 2024 02:45:31 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e706ee0a65sm13906261fa.112.2024.05.21.02.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 02:45:31 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 21 May 2024 12:45:29 +0300 Subject: [PATCH 09/12] remoteproc: qcom_wcnss: make use of QCOM_FW_HELPER Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240521-qcom-firmware-name-v1-9-99a6d32b1e5e@linaro.org> References: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> In-Reply-To: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Loic Poulain , Kalle Valo , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, Arnd Bergmann , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1128; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=DTUqzTL8iOBwkoam3qEvEmtJacPSZ5s4Txv1FotXGIM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmTG0zPLiR7dwV7D48NkYRmQHnnNAmGPP/K51cP jAUViaiRiOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZkxtMwAKCRCLPIo+Aiko 1TdoB/9DyT05xqeXzcbdzf5YPPdhcoo3145silkVCetoVq5t60jcbl44H4qmSe0k+GImIovA6KW xtgCjAng3vquS6ZKIU9Wx8jyfldrEI4khHxmIWrOwBKru967hGq0sskYp9msqoueB5DgeTpqhU/ Rywy6/IwOtZjl1CiKXIKT75Ny+zwM+cSnDSodIdICbWiuwoHl6ui8Yt3wFm6nB4RDuDPEQMxplj CRESXlPxtgZmYwDiWz/xz5hjPszcWG7GDtZ3S48Zii8OF9lFGqU0jF9EjSfIEfS2CTAbd0Soeuk 0QzgzP/MMTIvejFdnd091aBJ0NuyIEMx3DOtdJX3OPTokgOY X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Make the driver use qcom_fw_helper to autodetect the path to the calibration data file. Signed-off-by: Dmitry Baryshkov --- drivers/remoteproc/qcom_wcnss.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index 421a3943a90d..45fc578ae30b 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -555,8 +556,13 @@ static int wcnss_probe(struct platform_device *pdev) if (ret < 0 && ret != -EINVAL) return ret; + fw_name = qcom_get_board_fw(fw_name); + if (!fw_name) + return -ENOMEM; + rproc = devm_rproc_alloc(&pdev->dev, pdev->name, &wcnss_ops, fw_name, sizeof(*wcnss)); + kfree(fw_name); if (!rproc) { dev_err(&pdev->dev, "unable to allocate remoteproc\n"); return -ENOMEM; From patchwork Tue May 21 09:45:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 798017 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 584BC757F7 for ; Tue, 21 May 2024 09:45:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284737; cv=none; b=JnV/QzTxrgHJUXz77XyTT5YtUsz1TY1L661WYVgnEIwVpIEw9My9SgeRFuOaGnvkZoHDvzd7etgilABlE28A6v/OzPExDVxlD9jGLTnSKKzAQ1tPSXJ11ZJv+/6gJ8sWw/3sRoYzOZvGV8RM1XUBvgpiZ35Td4+NY0MxcqUTqpY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284737; c=relaxed/simple; bh=0EdhJdiexa04app1htF5yZNIe9fWs0XMN5UptBqZX9k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZPpSXhMgjD7CG6ELKHczWMnHlIe7aCq3B60+9kRc91JXt2upBgndOEdsui1Y1YkTZNl5TEZqQ+83522MfrCDaLIy5gaGGFZpuTVo4cgdTaky8/ifavIoEj+NXER+iLjiMvXk0OuXPmeJliKcopebgwCSAgyjkcrYVwhjst+iaRI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=L4ZSldht; arc=none smtp.client-ip=209.85.208.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="L4ZSldht" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2e719bab882so28046591fa.3 for ; Tue, 21 May 2024 02:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716284732; x=1716889532; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PjYD/nu8XaSwyIjsATzxMNejeBhx1zP8xP+ReawIdtI=; b=L4ZSldhtq84mu7ODLTq60hCMVbNseK04xEv30tGGe+QdLsD2oqk32arfUJKdKwmYYo zUQYPDCArK8q2xI1lzb1EVk7f1C3yv950tRlNVFA88Tri1xPG50V7ALpicovOb553Q5z DfWddAPQvFJzQNBYavebx3F97TSsN9lYC3ht53ul0VPb1ETbpd2cgnLW3nWGuJGSJTgY Pbrju9j91dbJU60+H0nQtjNHVcTVS9S1QhjgFaR72+BmIoyOLmWgwQ6pBiPimMsnFU5U ph2Q2uBOO3Lzk4Q+Y83QYf5A4rmZ+0eb6gXhitNwzvevbxp++APQj442s+RghjSVmYjZ uLWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716284732; x=1716889532; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PjYD/nu8XaSwyIjsATzxMNejeBhx1zP8xP+ReawIdtI=; b=aq0DZORvujxYAmMnOnKqyDJqnt+nzyqhzDLD8AQHfCdzxPNs+FOs0eCtpvPWXhudyI gHFYvhWI4plmPMNo4nc6R0Of4BhweB43AA7DFx+6Lshzi7bjGJ4XEmOaDurhtTbsg0R1 SDMqxjfZSahPxfOIDzjovHRxka21SC+B7GXgnvHt9gSio0AMD0/pbtdLGe/tqo8y2KYH sXbtilBKFanLHTNr8iXv0vwmeiCkrUVAGd0WwyOGhBx+fkn/GQs3KxAPSt32WQToiL7n 8Pr2viU2xonMUINgDCnhPesGe3Mnp6J9ynXceWzAOj9Gh0TUuQWMNwbSw+SohpseRcFu GxFg== X-Forwarded-Encrypted: i=1; AJvYcCWg8+dyEbJ03G2Hj9aHmsSp2tTjOHBipQghIJJiI/DNvD7G5y89ZcVGLtdo9PnnhbKZVD8aDCAg4XvlZM/p1DFpPBpQOfFdG4ukzJszYg== X-Gm-Message-State: AOJu0YzOsxmZwHcYvoR2jBYu5htXyp7GUQWH75kErC+TqQ7fxgrgQQ4E pPmOcVS/Ou2o73MTm20ATyPKEG7FDABnxaVpdqvYQyg04PDDKmWEyi+t7vStnC4= X-Google-Smtp-Source: AGHT+IH8qzC3fWXUUcidqVlxrEGo8Kdak9/c49iTORJ9N4V8gMmWJwg35UouqTVH8QmBlj4MSRInLA== X-Received: by 2002:a2e:9355:0:b0:2df:e0c4:8429 with SMTP id 38308e7fff4ca-2e51fd4afb7mr200777811fa.18.1716284732591; Tue, 21 May 2024 02:45:32 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e706ee0a65sm13906261fa.112.2024.05.21.02.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 02:45:32 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 21 May 2024 12:45:30 +0300 Subject: [PATCH 10/12] remoteproc: qcom_wcnss: make use of QCOM_FW_HELPER Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240521-qcom-firmware-name-v1-10-99a6d32b1e5e@linaro.org> References: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> In-Reply-To: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Loic Poulain , Kalle Valo , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, Arnd Bergmann , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=690; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=0EdhJdiexa04app1htF5yZNIe9fWs0XMN5UptBqZX9k=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmTG00kykDINSyj07g80LnRrExtHt62TUsGroa3 Z6F6OYOqsWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZkxtNAAKCRCLPIo+Aiko 1UBiCACZbvFD9mCBymBfZ6+3KEKZZ2J/FnpHuE6TjGdkMeNG5SRodLBYZyXVC4e5JS1pf+C3XbC gErxRfKXsyVINQ8MA87BhZ7QpUXd03DBZKEn8bwdlhNlOdIPcgmxm8lx0q8ufbmVNC1ftr3Q8LZ lG1UWkkCucAQ65LQ/u3VTGTr1qY8CW2RjguM3Y0drfu+nSCqRyab9vm1Jw5YZEHotkId6tSDVZj SuvwzzNCSQs0ND+Y1od4v+WRjSr34Fg9jctLq2aqO5f+DBG3JzcE1yi+1RDmvEroZu0vVmJ+GYy R7Z+jwB9aKX3zUKXW9f2Bwx9IACoxZd9JKsfd3QTmxv3sWr5 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Make the driver use qcom_fw_helper to autodetect the path to the calibration data file. Signed-off-by: Dmitry Baryshkov --- drivers/remoteproc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index 7bb22fdb64e4..e0ffcaeca03d 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -279,6 +279,7 @@ config QCOM_WCNSS_PIL depends on QCOM_SMEM depends on QCOM_SYSMON || QCOM_SYSMON=n depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n + select QCOM_FW_HELPER select QCOM_MDT_LOADER select QCOM_PIL_INFO select QCOM_RPROC_COMMON From patchwork Tue May 21 09:45:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 798016 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AB5276045 for ; Tue, 21 May 2024 09:45:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284738; cv=none; b=pghbNacoAf+A+T0CMU06wldrWmUQb1MpVTtrFRYO7bodprqbvxo35ODfWVydw/UsM130zbDeUrjGXyoTY4/3/F9QFV/DlQduQ+EQZdqJvLzM8BPNDAxdAohelUPAgf36FXCNC0rAvhTfeMDQH4VHgf0a6zAAXsVW8ueOXrNdgyk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716284738; c=relaxed/simple; bh=lOURPTyf/MozPD5HW7XYKU/orijtd9gkaS/jV+RA0uo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fV2tSNBT4mreu3vymdyvC8ics8kEk87oNLmgPr4cFmi0EdJkp1JVFejZ7O31ZhhnCnrHlkV9Nyykuk2iDhdJS2fquZ3l1Wu06e/vqvPBXpAIR5JkaMXQ/ZHvMf24AnbKv/KzfF4aCmx1AsZ+5lR9UKgIVDlCSyoK9t2weoTwaxU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=lu3JTEfa; arc=none smtp.client-ip=209.85.208.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="lu3JTEfa" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2e3e18c24c1so57267331fa.1 for ; Tue, 21 May 2024 02:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716284733; x=1716889533; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=zw7OrzfdTgB4KC/AhplUeUEfJhFyKT0ay66VXG+9Ap4=; b=lu3JTEfaoZMk2UrZXbGstpdm8WjFBesZ8GOXMH0gGSli0Vbxkn9Ygxn0iMaJrmmPPc azZX+QbWxrLJMUuX1u5isOgjrb28feVZxq00tkNwHyGNL1lmWhLx+kNU4W5zTbcuIBOq kYdtdcxLXBo8LVFugpXCa/tszxsbAYDfZAKhPk8igcHL43oMskAV8bFUb7WGHYCs9P37 V/HIO3ZEomUy13DvWNgAvQPvKwbrG9FfJq73e1bvy5WD8BDw2D9ecucoHnh/llDm+GiG 3ZgIDz1SCBuYLLZSZiwwZA3hEErBAiP1mqLsi9LvRhUNATYw49YM3G3wUSbcm5nTQGpa rzYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716284733; x=1716889533; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zw7OrzfdTgB4KC/AhplUeUEfJhFyKT0ay66VXG+9Ap4=; b=DUscUoKtFkgrsNnVzOcw0aalDRkrcAn5lYHRZj39kZMPeQ79YzmouctHRfeh/R7Ry0 O6htFi66lwHJSBQFDSmrbhvV2yuVjZP/CeobsT6O/bjtXUQZp8bHL/crSh2GzauDr2nY tD8W3L1520HZJ96JTb8bnKAYajL+kv7U70cLQd34A2PQL4ZkHMHD3Enr7lI66W1orP0b vlVApxAf4RBOi/R+vihoFoCP56fc95vlGpOplteQSxkQLc1wFsyBorxkJn0P9C/Z/GK0 ruz16sh4dOSEtj4qu5kyId8Sm50ZsLieDATmvbXAsLqXnv5Ml6UArz3LkIsnGApCq+y3 epkQ== X-Forwarded-Encrypted: i=1; AJvYcCU7xbo8HLqDPoBHU8d9T7oyGmLpC/upZ2bn2h+HBOC4bIyJucNivhSxL/X1TwJVdRRJ4JPOw+6kAvClw54XjGG2OvjUaRs0eVa5FFWMRg== X-Gm-Message-State: AOJu0YweGXL3x4LJm3gY4GHH2JDhZn4Yn0QVZDrCXp6iJsxx2O2c7Dt7 lhadw8ZlHdgQMGC+UxXtlub3ojH2Uh1GS6p5i+0R2n7mEE53HAnDDzdHdbquGXE= X-Google-Smtp-Source: AGHT+IGX1Q176IzT5QXdTwJ4xeLLRxar3B9GcFke5IAQRDPGkKTD4QJYxG6uph4uMX4AvCo7vIqoIw== X-Received: by 2002:a05:651c:14f:b0:2e4:e02c:a0bc with SMTP id 38308e7fff4ca-2e51ff65d1amr221714241fa.31.1716284733338; Tue, 21 May 2024 02:45:33 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e706ee0a65sm13906261fa.112.2024.05.21.02.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 02:45:32 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 21 May 2024 12:45:31 +0300 Subject: [PATCH 11/12] arm64: dts: qcom: apq8016-sbc: drop firmware-name properties Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240521-qcom-firmware-name-v1-11-99a6d32b1e5e@linaro.org> References: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> In-Reply-To: <20240521-qcom-firmware-name-v1-0-99a6d32b1e5e@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Loic Poulain , Kalle Valo , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, Arnd Bergmann , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1078; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=lOURPTyf/MozPD5HW7XYKU/orijtd9gkaS/jV+RA0uo=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmTG004RzknfFr2xUTYDfig7qbAJdCOKGDfe99k 9euDeWDqcCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZkxtNAAKCRCLPIo+Aiko 1feYB/9kr5Vq0IGkYGlqoyLUubukycE69t/Ty8gnlJ3JC5immim+H5tkJHAjolUChQrwcLzpChb QyH01xEy28Z34X99QnGbZn9THweOucUS83xmb3RFt0qpYUXmqIc7bxQdiglfTjJm918Z4WKH/J3 6UrEaVSu99ghVgwEOwXSka2rAIkiJxlQu74fIymcuD0qYyHsHbeWWnqjr47ngNnQ2wDrFDRPwF/ JgRxhptkMB3tCOteUbsbhF8s9DCzU6/5MMv1/C4CVsqJWY1SvtEzvwtU0BWxTvp8C8v1AA4txXW WXRDEWkyvxigO3lJ8uadhOc25kg0ZP2tqEuUdt/TbRwKFONB X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A As the drivers default to loading the firmware from the board-specific location, drop the firmware-name properties. In case of the WCNSS calibration data drop the path to the file, retaining just the file name. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts index aba08424aa38..24779238cc18 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts @@ -260,8 +260,6 @@ &mdss_dsi0_out { &mpss { status = "okay"; - - firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn"; }; &mpss_mem { @@ -388,11 +386,10 @@ &venus_mem { &wcnss { status = "okay"; - firmware-name = "qcom/apq8016/wcnss.mbn"; }; &wcnss_ctrl { - firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin"; + firmware-name = "WCNSS_qcom_wlan_nv_sbc.bin"; }; &wcnss_iris {