From patchwork Thu Feb 2 06:17:32 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: 51732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp70032wrn; Wed, 1 Feb 2023 22:23:06 -0800 (PST) X-Google-Smtp-Source: AK7set+Zxbi6pAEFleh1gbAzVYZSMtberGJe3QFYPyRjX/0OERPDFivHrWmurplZtltsh6Ml97PC X-Received: by 2002:a17:902:d4cf:b0:196:492b:d7de with SMTP id o15-20020a170902d4cf00b00196492bd7demr6257249plg.58.1675318986115; Wed, 01 Feb 2023 22:23:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675318986; cv=none; d=google.com; s=arc-20160816; b=IAvFOKPU7+0A6UBLaH6Tlym4JK8ZjmpSQeIGxl22dxRgY0gvnZcISdopV+Kv9phASX Z8KaFmCJtUNuvviRR7Mafvhh4ZC4MqyaU2OAVHORXLtTIV60w6uXp2p0v2ueKKBOPS2n beqKtpKBmOl4GyOCaFIhrytRRI5M/FJX+sW5kV82C44BfRmEzDt5N7yilaGl85bieVm1 c2HVEY3Bsbkxs+H4XuRsJ5pq2cVc5kz2woBJfyE92PPlUAVRUH2GjPxJcBuvDJJYLcfO u3871joSOBw40ZskJbGl8TbvjFtdUyDsZgYGrK3wk1Bg/wZVSx1kXQottXxeoKlD72wt F3zw== 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=mKjiuRP7DP1TE1hj0rW2xT+bQb9IqdZ+UgPfm1SQrmk=; b=DZH5r3BPCOuodcIIY+df3bPC8hmgIs2XZVJuTzlaXf3fGKJoEBJiJ5aZLK5/J/exjD kP5vsyDifM3z6Z6ZQvKFUwP8K5vYjA6QFfxCFPJ0/l4u0DKuQidkfDKc8iJV1tDcY/la KfWfkEzvmzXZOnVDHPvjM1y88CLygZn4qP0UTfsknJSga1AfrOvPV+jq94drUpcvzOOu gsdOVntp/MTse9pzLdvy5TcSx04jrvxJFpZnctTgJbyJHp5qj5TAJe03rwBnfMQQvybX iFypGtgCyoB8Xzq81Fx43JrSxO0gmOz+copqofxXxcMDGog/UqdrdNvf4vp3o/E9AfKt HlVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b="TL/eJVt0"; 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 ay3-20020a1709028b8300b00196711a94f6si13210256plb.353.2023.02.01.22.22.53; Wed, 01 Feb 2023 22:23:06 -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="TL/eJVt0"; 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 S231617AbjBBGS2 (ORCPT + 99 others); Thu, 2 Feb 2023 01:18:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229671AbjBBGSZ (ORCPT ); Thu, 2 Feb 2023 01:18:25 -0500 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D71D4C0EB; Wed, 1 Feb 2023 22:18:23 -0800 (PST) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3121rT0M011836; Thu, 2 Feb 2023 06:18:17 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=mKjiuRP7DP1TE1hj0rW2xT+bQb9IqdZ+UgPfm1SQrmk=; b=TL/eJVt0g0nVtSXzU42h2Wj7VcPrz0Aa8NzfRUk5eL7IpgHNm9V3Ay+6Rg0xOfaEeL1t 5mX51gKlt5iL0x/Qi5heGbI0Ui0oJiZn4x7rtEafd5p1fZqUg0Jjq6HtR2ack4bwAdJD aX4OsFi5Du4sw/3eE8uPLZ31L0xSdo3sv239Oo3ar05SWeReyeJSiTZ+BoDjzGb8ClPI +kwOVpgynJB4nITt3kU9WkrGsqwn/dnSUm3aepv2qhFemrcYjw4oPbUNV7LXK+BLjMkf GmzkFF52EJoPdu50fG00I28vegz5SDWYhk4psYocEoXcrrPTI1NzKv/cNasIVjH1NVnh ZQ== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3nfqsy9xb7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 02 Feb 2023 06:18:17 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3126IGCl008823 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 2 Feb 2023 06:18: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, 1 Feb 2023 22:18:11 -0800 From: Srinivasa Rao Mandadapu To: , , , , , , , , , , , , , CC: Srinivasa Rao Mandadapu Subject: [PATCH v7 4/5] clk: qcom: lpassaudiocc-sc7280: Merge AHB clocks into lpass_aon Date: Thu, 2 Feb 2023 11:47:32 +0530 Message-ID: <1675318653-28352-5-git-send-email-quic_srivasam@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1675318653-28352-1-git-send-email-quic_srivasam@quicinc.com> References: <1675318653-28352-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-GUID: 3lRHnP-XwzHhUB7097c_a7EoFhK2iaSm X-Proofpoint-ORIG-GUID: 3lRHnP-XwzHhUB7097c_a7EoFhK2iaSm X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-01_15,2023-01-31_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 bulkscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 mlxscore=0 mlxlogscore=746 priorityscore=1501 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302020058 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?1756699281079447425?= X-GMAIL-MSGID: =?utf-8?q?1756699281079447425?= Merge AHBM and AHBS clocks into lpass_aon clk_regmap structure as they are using same register space. Add conditional check for doing Q6 AHB clocks registration only if regname specified in device tree node. In existing implementation, Q6 AHB clocks and lpass_aon clocks are being registered exclusively and overlapping if both of them are to be used.The regmap region used by Q6 AHB clocks is <0x03389000 0x24> and of lpass_aon clocks is <0x03380000 0x30000>. This is required to avoid such overlapping and to register Q6 AHB clocks and lpass_aon clocks simultaneously. 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/lpassaudiocc-sc7280.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/clk/qcom/lpassaudiocc-sc7280.c b/drivers/clk/qcom/lpassaudiocc-sc7280.c index 1339f92..8e2f433 100644 --- a/drivers/clk/qcom/lpassaudiocc-sc7280.c +++ b/drivers/clk/qcom/lpassaudiocc-sc7280.c @@ -660,6 +660,8 @@ static struct clk_regmap *lpass_aon_cc_sc7280_clocks[] = { [LPASS_AON_CC_TX_MCLK_2X_CLK] = &lpass_aon_cc_tx_mclk_2x_clk.clkr, [LPASS_AON_CC_TX_MCLK_CLK] = &lpass_aon_cc_tx_mclk_clk.clkr, [LPASS_AON_CC_TX_MCLK_RCG_CLK_SRC] = &lpass_aon_cc_tx_mclk_rcg_clk_src.clkr, + [LPASS_Q6_AHBM_CLK] = &lpass_q6ss_ahbm_clk.clkr, + [LPASS_Q6_AHBS_CLK] = &lpass_q6ss_ahbs_clk.clkr, }; static struct gdsc *lpass_aon_cc_sc7280_gdscs[] = { @@ -819,6 +821,7 @@ static int lpass_aon_cc_sc7280_probe(struct platform_device *pdev) { const struct qcom_cc_desc *desc; struct regmap *regmap; + struct resource *res; int ret; ret = lpass_audio_setup_runtime_pm(pdev); @@ -826,10 +829,12 @@ static int lpass_aon_cc_sc7280_probe(struct platform_device *pdev) return ret; if (of_property_read_bool(pdev->dev.of_node, "qcom,adsp-pil-mode")) { - lpass_audio_cc_sc7280_regmap_config.name = "cc"; - desc = &lpass_cc_sc7280_desc; - ret = qcom_cc_probe(pdev, desc); - goto exit; + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc"); + if (res) { + lpass_audio_cc_sc7280_regmap_config.name = "cc"; + desc = &lpass_cc_sc7280_desc; + return qcom_cc_probe(pdev, desc); + } } lpass_audio_cc_sc7280_regmap_config.name = "lpasscc_aon";