From patchwork Wed Jan 4 16:21:36 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: 38985 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5229784wrt; Wed, 4 Jan 2023 08:23:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXtYE/yvSp6SuUxPNV85S4UNu0WIcdyGDVqyF2DTtHgeRwiVNAXw8iL+V8YUFlBjMTXCsQdd X-Received: by 2002:a17:907:a485:b0:7c1:709d:fa49 with SMTP id vp5-20020a170907a48500b007c1709dfa49mr52404770ejc.18.1672849425169; Wed, 04 Jan 2023 08:23:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672849425; cv=none; d=google.com; s=arc-20160816; b=0GZNbFDOqZ2MdgX2QhpjG8d9u5V7D6MTNkraUYhBFptUfZCbhm1h+ozU9tja/k8vcM jR4fDw7xdK6YFc/TGzujg+6pOndYAXTTP5S8S2BtXKOJvYKFsfhlRtCbBvxxp25dI0nO PtUW7UKhpgI7RI9F2f4xKetDvrfVLPpZVTOJZHho8BnvyxGZnM9fd2m0em5UQ9vm5xNN fDtDgcA+FBJ3JzpWVQq4WFiOKlHsniJsaAgLCeGHgLbvW4HgfJektzYn8fe2pQW7iTVS r+kelXbbwdWhZB+Q9JpIzoWslYJUJXJBKTKrDoGnMhLFgU0r8Q8rfmWDvT+Tk7+tC9IC Pq1Q== 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=Hun4tShDJW/J1A08g/Eq2RnjtlijMdJDXBWLheWhPsM=; b=PqMn5zQNmlNor+E7kZBgbrWNwJdG+d2+KMeLkJ1CWVmSuePIxnnIRsWhBConY/FglT w9spStw5/Oi4xXXZl5ipLu4nrFTNLJSl1bRfVyoVFc2YrtfL19gaonUdHV35av60/DMh KzxSuV/DyhoG9iYin2yRS2kvu+ERqPaP8vrhD41C/UTcCx7tjxnniqu9wUSsPJbC5ZnW P7JDwJifXp/cB2hYzf/DaywXAdu5BVjUlKwsGCJ9N3Lse0h7y49ZPEeINp+nYX9MNPxj u0qFK3AzzI/siCSB44pdyrpggenX4Tue7OQjwOA8OEOvHt8bXoquTRTPPZ9Hrwa16mYJ kByQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=VowSkmqW; 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 xa8-20020a170906fd8800b007c0ea5a7ca4si29160506ejb.858.2023.01.04.08.23.13; Wed, 04 Jan 2023 08:23:45 -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=VowSkmqW; 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 S235013AbjADQWr (ORCPT + 99 others); Wed, 4 Jan 2023 11:22:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239774AbjADQWY (ORCPT ); Wed, 4 Jan 2023 11:22:24 -0500 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E86B141D46; Wed, 4 Jan 2023 08:22:23 -0800 (PST) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 304CU9Ym007943; Wed, 4 Jan 2023 16:22:18 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=Hun4tShDJW/J1A08g/Eq2RnjtlijMdJDXBWLheWhPsM=; b=VowSkmqWdjv4Jyk0+0Y9qNUwUY/81EbWHfqwD4RRAsIGZxtYoWGRQq44WGYWDoP8oKvd fqySPM0+ujxHAXLoudOBweCuDn2nIokceEuWdgQi6ABfBONczzWeL5Sug3mWuopjvlyE J5bpyQuaFnD3BCEAbJVA0nYPgWA2BtZr24x86BT2IfIjKcdKdkBsgEgSsHp+rF6lzlm/ hWMeJ2bkh4YR3pRPpN9cmW1d1pIrCNx0NXlDZKGx8pyalVRoiovk1GFPY/Pi2DDcTs08 0TTLBPLrNAAons0NLR94mgKb+AuFuIu4agOJ4vIirXrnYrUGBYi9RAZ2NVcWtm28tLV3 Sg== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3mvsvxta5n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Jan 2023 16:22:18 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 304GMGZb022781 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 4 Jan 2023 16:22:16 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 08:22:12 -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:51:36 +0530 Message-ID: <1672849297-3116-4-git-send-email-quic_srivasam@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1672849297-3116-1-git-send-email-quic_srivasam@quicinc.com> References: <1672849297-3116-1-git-send-email-quic_srivasam@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) 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-ORIG-GUID: -jmnsLhLaaR45AARn9NkhFFC-dGhkl-w X-Proofpoint-GUID: -jmnsLhLaaR45AARn9NkhFFC-dGhkl-w 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 bulkscore=0 suspectscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 spamscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301040136 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1754109759019329581?= X-GMAIL-MSGID: =?utf-8?q?1754109759019329581?= 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 Reviewed-by: Stephen Boyd --- drivers/clk/qcom/lpasscc-sc7280.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/clk/qcom/lpasscc-sc7280.c b/drivers/clk/qcom/lpasscc-sc7280.c index 5c1e17b..85dd5b9 100644 --- a/drivers/clk/qcom/lpasscc-sc7280.c +++ b/drivers/clk/qcom/lpasscc-sc7280.c @@ -118,12 +118,14 @@ static int lpass_cc_sc7280_probe(struct platform_device *pdev) goto destroy_pm_clk; } - lpass_regmap_config.name = "qdsp6ss"; - desc = &lpass_qdsp6ss_sc7280_desc; + 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; + 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;