Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 06 May 2021 21:18:04 +0000
To:     Andy Gross <agross@kernel.org>,
        Bjorn Andersson <bjorn.andersson@linaro.org>,
        Rob Herring <robh+dt@kernel.org>,
        Ohad Ben-Cohen <ohad@wizery.com>,
        Mathieu Poirier <mathieu.poirier@linaro.org>,
        linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org,
        devicetree@vger.kernel.org
From:   Yassine Oudjana <y.oudjana@protonmail.com>
Cc:     Yassine Oudjana <y.oudjana@protonmail.com>,
        Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
        Konrad Dybcio <konrad.dybcio@somainline.org>,
        linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht
Reply-To: Yassine Oudjana <y.oudjana@protonmail.com>
Subject: [PATCH 1/3] remoteproc: qcom: pas: Use the same init resources for MSM8996 and MSM8998
Message-ID: <zbAB2sceYHmsYeraZUi4YUKL7lgFMu13w3vHQQYUQ4@cp3-web-020.plabs.ch>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The init resources for MSM8996 are missing power domains, and adding them
makes the resources identical to the MSM8998 ones. Remove slpi_resource_ini=
t
and use MSM8998 resources for both chips.

Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
---
 drivers/remoteproc/qcom_q6v5_pas.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q=
6v5_pas.c
index b921fc26cd04..b1e613187c68 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -689,17 +689,6 @@ static const struct adsp_data mpss_resource_init =3D {
 =09.ssctl_id =3D 0x12,
 };
=20
-static const struct adsp_data slpi_resource_init =3D {
-=09=09.crash_reason_smem =3D 424,
-=09=09.firmware_name =3D "slpi.mdt",
-=09=09.pas_id =3D 12,
-=09=09.has_aggre2_clk =3D true,
-=09=09.auto_boot =3D true,
-=09=09.ssr_name =3D "dsps",
-=09=09.sysmon_name =3D "slpi",
-=09=09.ssctl_id =3D 0x16,
-};
-
 static const struct adsp_data sm8150_slpi_resource =3D {
 =09=09.crash_reason_smem =3D 424,
 =09=09.firmware_name =3D "slpi.mdt",
@@ -803,8 +792,8 @@ static const struct adsp_data sdx55_mpss_resource =3D {
=20
 static const struct of_device_id adsp_of_match[] =3D {
 =09{ .compatible =3D "qcom,msm8974-adsp-pil", .data =3D &adsp_resource_ini=
t},
-=09{ .compatible =3D "qcom,msm8996-adsp-pil", .data =3D &adsp_resource_ini=
t},
-=09{ .compatible =3D "qcom,msm8996-slpi-pil", .data =3D &slpi_resource_ini=
t},
+=09{ .compatible =3D "qcom,msm8996-adsp-pil", .data =3D &msm8998_adsp_reso=
urce},
+=09{ .compatible =3D "qcom,msm8996-slpi-pil", .data =3D &msm8998_slpi_reso=
urce},
 =09{ .compatible =3D "qcom,msm8998-adsp-pas", .data =3D &msm8998_adsp_reso=
urce},
 =09{ .compatible =3D "qcom,msm8998-slpi-pas", .data =3D &msm8998_slpi_reso=
urce},
 =09{ .compatible =3D "qcom,qcs404-adsp-pas", .data =3D &adsp_resource_init=
 },
--=20
2.31.1