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=-10.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=ham 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 90375C07E99 for ; Fri, 9 Jul 2021 17:03:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 727BF613C8 for ; Fri, 9 Jul 2021 17:03:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230018AbhGIRGP (ORCPT ); Fri, 9 Jul 2021 13:06:15 -0400 Received: from mail-0201.mail-europe.com ([51.77.79.158]:48306 "EHLO mail-0201.mail-europe.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229553AbhGIRGL (ORCPT ); Fri, 9 Jul 2021 13:06:11 -0400 Date: Fri, 09 Jul 2021 17:03:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1625850205; bh=p3KeN6Ovv4Z8TpSQ+6KBlTBtLTfzq3KeNEJzsQY+/7M=; h=Date:To:From:Cc:Reply-To:Subject:From; b=HeBG96N1fbWjhmBPAa3b4Ii+tUrmDQLz0ebLnLFsYoGB71RQwpZXRORVyKYarkz/v py1S8cYsjCTXFDKQUUNVWaBPys5ig/ged3AINpde/NK3dFvl8mCu2/wSF0xVjIaKdD NlTrOe8sLyuaqtvTkUeiALrNpJPTyu2yOAa6o13I= To: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org From: Yassine Oudjana Cc: Yassine Oudjana , Andy Gross , Bjorn Andersson , Ohad Ben-Cohen , Mathieu Poirier , Manivannan Sadhasivam , Konrad Dybcio , "Dr. Git" , Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Reply-To: Yassine Oudjana Subject: [PATCH 4/5] remoteproc: qcom: pas: Use the same init resources for MSM8996 and MSM8998 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The resources for MSM8996 are missing power domains, and adding them makes the resources identical to the MSM8998 ones. Rename msm8998_adsp_reso= urce to msm8996_adsp_resource then use it for both chips. Also add power domains= to slpi_resource_init and use it for both chips. Signed-off-by: Yassine Oudjana --- drivers/remoteproc/qcom_q6v5_pas.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q= 6v5_pas.c index a79bee901e9b..7e72d5f0150e 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -585,7 +585,7 @@ static const struct adsp_data sm8350_adsp_resource =3D = { =09.ssctl_id =3D 0x14, }; =20 -static const struct adsp_data msm8998_adsp_resource =3D { +static const struct adsp_data msm8996_adsp_resource =3D { =09=09.crash_reason_smem =3D 423, =09=09.firmware_name =3D "adsp.mdt", =09=09.pas_id =3D 1, @@ -714,6 +714,10 @@ static const struct adsp_data slpi_resource_init =3D { =09=09.pas_id =3D 12, =09=09.has_aggre2_clk =3D true, =09=09.auto_boot =3D true, +=09=09.proxy_pd_names =3D (char*[]){ +=09=09=09"ssc_cx", +=09=09=09NULL +=09=09}, =09=09.ssr_name =3D "dsps", =09=09.sysmon_name =3D "slpi", =09=09.ssctl_id =3D 0x16, @@ -779,21 +783,6 @@ static const struct adsp_data sm8350_slpi_resource =3D= { =09.ssctl_id =3D 0x16, }; =20 -static const struct adsp_data msm8998_slpi_resource =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.proxy_pd_names =3D (char*[]){ -=09=09=09"ssc_cx", -=09=09=09NULL -=09=09}, -=09=09.ssr_name =3D "dsps", -=09=09.sysmon_name =3D "slpi", -=09=09.ssctl_id =3D 0x16, -}; - static const struct adsp_data wcss_resource_init =3D { =09.crash_reason_smem =3D 421, =09.firmware_name =3D "wcnss.mdt", @@ -822,10 +811,10 @@ 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-adsp-pil", .data =3D &msm8996_adsp_reso= urce}, =09{ .compatible =3D "qcom,msm8996-slpi-pil", .data =3D &slpi_resource_ini= t}, -=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,msm8998-adsp-pas", .data =3D &msm8996_adsp_reso= urce}, +=09{ .compatible =3D "qcom,msm8998-slpi-pas", .data =3D &slpi_resource_ini= t}, =09{ .compatible =3D "qcom,qcs404-adsp-pas", .data =3D &adsp_resource_init= }, =09{ .compatible =3D "qcom,qcs404-cdsp-pas", .data =3D &cdsp_resource_init= }, =09{ .compatible =3D "qcom,qcs404-wcss-pas", .data =3D &wcss_resource_init= }, --=20 2.32.0