From patchwork Wed Jan 4 15:58:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivasa Rao Mandadapu X-Patchwork-Id: 38981 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5218908wrt; Wed, 4 Jan 2023 08:04:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXtGoiMNW416hthLxE1PmNX5G5u8hcE7IC2Yr7wWQI3z/FtiTcBxeMNVNhy5swtqWzxj1FRi X-Received: by 2002:a62:a507:0:b0:582:848c:6281 with SMTP id v7-20020a62a507000000b00582848c6281mr7419075pfm.2.1672848254651; Wed, 04 Jan 2023 08:04:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672848254; cv=none; d=google.com; s=arc-20160816; b=C3v6nM5bEnps1I90wwOqRuQ0AZDF12kFL8ValTQEmKp/hfuyz+RtxU/z8vm7vxKzhS v2+dt2vjx1tffg4dG1eIxiqj2Qs5w6jAMp4gtSewCXuunzeI6lth5xpjEa5vUUV4qTMr m2aQXXUDNKwFetmHSA12mQmQAfMWgA7nX6PsChladYxyo2SIxmkNckRjtpvHxsKOUfsX zNwQvqbah/mnMZoFrP7yE0A9JJmB7+yrILRpuN6lSk/oPm3+GW00YDCnr2fIOVV7egH6 Y9+KWAQCT4N6EvxOrxTbb4nDxgXMuepSUQe7nl+iWGNohgl543wVhkfp3CvgEydqdfyL JyPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=qUyuvJONSxnVA5HM5R0JPvWJe9BAjpbf8Y47UEEh1sA=; b=yRf/HAtNOpttUyXYLPPIos8W8LU7+vP0MTTBeDgf5mgB1gZMK1bWNvZKyO60F1dE33 /6tskfiwCPH730gmXNlbhd/ui5iiReotgt1UBhAzNgvzp94BaD28CmSGsu5kMnogFfeb pvwJn5TOPGVwCRIr6/ldsORHSJCB4X5tuM3GPkEBre2FqtJhnn/ZwwA6fC2u+uXZ9LuQ ddea/3rZJRvsUyT4p8NsS0fPK1Ts/NwrvKkwBAe0c7M5VreKKxWdNkzFYLOZ6w+sTEpZ +A8W2ZdFWkddU4411nMkijxmlojTyJ3q8Ak7MlcnXIe3yYUf/s2w+H2BFVhRDwjbEb3B krSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=EdiTbhK2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g4-20020a056a0023c400b005778bad9750si1099413pfc.17.2023.01.04.08.03.51; Wed, 04 Jan 2023 08:04:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=EdiTbhK2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239798AbjADP70 (ORCPT + 99 others); Wed, 4 Jan 2023 10:59:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239747AbjADP6x (ORCPT ); Wed, 4 Jan 2023 10:58:53 -0500 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CDA2BD8; Wed, 4 Jan 2023 07:58:53 -0800 (PST) Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 304CjiRw014756; Wed, 4 Jan 2023 15:58:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=qUyuvJONSxnVA5HM5R0JPvWJe9BAjpbf8Y47UEEh1sA=; b=EdiTbhK2CIkhQ/TyOp8bAVW9bqm/pHhnfBGWTBttEA65vw7qVYwlKVI9QUrphp56binj PUM+U74OEc1DTw22T2ODXXbkZXml4ht1bXHCWUXgkoL2joH4S4AH9HQSwQch8bnM/X3n AQz/JlmDrH0Cw9e5COKZho3S6aScrVadPFSkAItJO0oOkKn8HEg07XbiR0c4KcZOZgkS Eywcl+kCtztBVhq9C1lzkgJj5uA7lYVwjpHJpIpW0L1QX0WfuuCnfp6D1CUE+bQryjEs HFsHKDsRNbklHnJYLddIjGItquNI8Iimh2dKvDSJDyR5L4KZJZ/1PVqQSooqaQh2lKZL 7Q== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3mvsvfa59n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Jan 2023 15:58:46 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 304FwjjK001858 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 4 Jan 2023 15:58:45 GMT Received: from hu-srivasam-hyd.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 4 Jan 2023 07:58:40 -0800 From: Srinivasa Rao Mandadapu To: , , , , , , , , , , , , , CC: Srinivasa Rao Mandadapu Subject: [RESEND v3 3/4] clk: qcom: lpasscc-sc7280: Skip qdsp6ss clock registration Date: Wed, 4 Jan 2023 21:28:11 +0530 Message-ID: <1672847892-25154-4-git-send-email-quic_srivasam@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1672847892-25154-1-git-send-email-quic_srivasam@quicinc.com> References: <1672847892-25154-1-git-send-email-quic_srivasam@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: YaweQrEpbdzV6TD2_3H9TmWhIF7jnR-s X-Proofpoint-ORIG-GUID: YaweQrEpbdzV6TD2_3H9TmWhIF7jnR-s X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-04_07,2023-01-04_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 spamscore=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 phishscore=0 mlxscore=0 bulkscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301040132 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754108531445931339?= X-GMAIL-MSGID: =?utf-8?q?1754108531445931339?= The qdsp6ss memory region is being shared by ADSP remoteproc device and lpasscc clock device, hence causing memory conflict. As the qdsp6ss clocks are being enabled in remoteproc driver, skip qdsp6ss clock registration if "qcom,adsp-pil-mode" is enabled. Fixes: 4ab43d171181 ("clk: qcom: Add lpass clock controller driver for SC7280") Signed-off-by: Srinivasa Rao Mandadapu Tested-by: Mohammad Rafi Shaik --- drivers/clk/qcom/lpasscc-sc7280.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/clk/qcom/lpasscc-sc7280.c b/drivers/clk/qcom/lpasscc-sc7280.c index 5c1e17b..e1af32c 100644 --- a/drivers/clk/qcom/lpasscc-sc7280.c +++ b/drivers/clk/qcom/lpasscc-sc7280.c @@ -118,12 +118,15 @@ static int lpass_cc_sc7280_probe(struct platform_device *pdev) goto destroy_pm_clk; } - lpass_regmap_config.name = "qdsp6ss"; - desc = &lpass_qdsp6ss_sc7280_desc; - - ret = qcom_cc_probe_by_index(pdev, 0, desc); - if (ret) - goto destroy_pm_clk; + if (!of_property_read_bool(pdev->dev.of_node, "qcom,adsp-pil-mode")) { + lpass_regmap_config.name = "qdsp6ss"; + desc = &lpass_qdsp6ss_sc7280_desc; + + ret = qcom_cc_probe_by_index(pdev, 0, desc); + if (ret) + goto destroy_pm_clk; + } + } lpass_regmap_config.name = "top_cc"; desc = &lpass_cc_top_sc7280_desc;