From patchwork Fri Jan 6 20:10:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091761 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A1BDC7112F for ; Fri, 6 Jan 2023 20:11:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236350AbjAFULE (ORCPT ); Fri, 6 Jan 2023 15:11:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236357AbjAFUKd (ORCPT ); Fri, 6 Jan 2023 15:10:33 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61B028408B for ; Fri, 6 Jan 2023 12:10:32 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id bt23so3509762lfb.5 for ; Fri, 06 Jan 2023 12:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TuUy5yyevuXzH7JuK2+w6B5BQU4+qQbNBPhTpPAW49E=; b=zdSvQNRvc4UnPxfIb96X/vFrLp8/WzQ6E4EABtgjLnw4h2FHxTs/iykysWMX0BIyQf Bi3SYVTDHy7h8fbJC2Q5yvGEFIHfzBnkNeVfRnACDt/RlXjRONWn1mdvR2pOwIhwcX7X jqejIBo0Q6skdgHFSmkAKRtPMvlS9DHgog+RWSDhX6JHaSiZpdQGkyAADQV/NOYYXnTb mi0uM3z5xDHSqBhesr66HF6IhKTA7+6QTzpKBkmCRJMsSONuFxmVKSXP0O0ElGJfVimo 3Gx8vKLG5Q5tjUz/RUudCZKyM8zjbEdZuQBjSE2nTOAg2YlX79hH5LdHBdOto0HkDh28 hLvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TuUy5yyevuXzH7JuK2+w6B5BQU4+qQbNBPhTpPAW49E=; b=24tKFINUNaTcrXwC/fM7IYKIw3Obp0MCOomEeAsRAT2M4tsftjvY35tPVtnI5oXByj wF64BjHFYvTsPy9V/CLQJDQ2xzXgk+NOxpzPeQRHpPts1P9UDN8SJSWZFNNwQGVtXTI0 1j0GC8+kM1Sdl2qMMw/xsf9Mw4522VvoIZeUFd1r5k/B43yBwoiT2gMhzuhHE9orCpcS szTpp8kWmrAIu44+iI9xsBoFaspeeHpV6Mnxl/28u61oNKBCe9+vauSFi5djsmQ18Yml BTyYQS/V1QFi4d/J/aO/NqNMMDXElPhEOAq+kZSjAQMjhGWjP8opIMRKZ0/3RxHdJFW5 5xQQ== X-Gm-Message-State: AFqh2kp368NSDnXUc549vfXue4XakQ736aKR9dqtGuyuVG4poh7oQ5/4 IjZjmJi/zktpVQSEKQ7nWpnvPQ== X-Google-Smtp-Source: AMrXdXv7Y/4iNUsUw6hS7Lbgq03gUAjyZCLZ50ZgqYhkOjMEiUmdv6BU/LrEeejlecWintFTpU9hGQ== X-Received: by 2002:a05:6512:110c:b0:4cc:586b:1837 with SMTP id l12-20020a056512110c00b004cc586b1837mr2684617lfg.16.1673035830774; Fri, 06 Jan 2023 12:10:30 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:30 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 01/11] interconnect: qcom: sdx55: drop IP0 remnants Date: Fri, 6 Jan 2023 22:10:18 +0200 Message-Id: <20230106201028.1809541-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Drop two defines leftover from the commit 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0 interconnects"), which dropped handling of the IP0 resource in favour of handling it in the clk-rpmh driver. Fixes: 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0 interconnects") Signed-off-by: Dmitry Baryshkov --- drivers/interconnect/qcom/sdx55.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/interconnect/qcom/sdx55.h b/drivers/interconnect/qcom/sdx55.h index deff8afe0631..46cbabec8aa1 100644 --- a/drivers/interconnect/qcom/sdx55.h +++ b/drivers/interconnect/qcom/sdx55.h @@ -6,7 +6,7 @@ #ifndef __DRIVERS_INTERCONNECT_QCOM_SDX55_H #define __DRIVERS_INTERCONNECT_QCOM_SDX55_H -#define SDX55_MASTER_IPA_CORE 0 +/* 0 was used by MASTER_IPA_CORE, now represented as RPMh clock */ #define SDX55_MASTER_LLCC 1 #define SDX55_MASTER_TCU_0 2 #define SDX55_MASTER_SNOC_GC_MEM_NOC 3 @@ -28,7 +28,7 @@ #define SDX55_MASTER_QDSS_ETR 19 #define SDX55_MASTER_SDCC_1 20 #define SDX55_MASTER_USB3 21 -#define SDX55_SLAVE_IPA_CORE 22 +/* 22 was used by SLAVE_IPA_CORE, now represented as RPMh clock */ #define SDX55_SLAVE_EBI_CH0 23 #define SDX55_SLAVE_LLCC 24 #define SDX55_SLAVE_MEM_NOC_SNOC 25 From patchwork Fri Jan 6 20:10:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091759 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33481C678D5 for ; Fri, 6 Jan 2023 20:11:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236326AbjAFUK6 (ORCPT ); Fri, 6 Jan 2023 15:10:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236399AbjAFUKf (ORCPT ); Fri, 6 Jan 2023 15:10:35 -0500 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A72DF84090 for ; Fri, 6 Jan 2023 12:10:33 -0800 (PST) Received: by mail-lf1-x12c.google.com with SMTP id bp15so3496763lfb.13 for ; Fri, 06 Jan 2023 12:10:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PkMG+K9H+pGjfaEipJupWJDRprpXoKUTvkDrtSa1M8g=; b=lYLgnUmFIUCTe1lsQi1+rAKkz/9Qlq2O6yt16Z1KqFnl5ZCqchG1b2I7xWmyciwQsR dfcOof5J9ckILmq0kMCRSuiyXYlbUTaO/7NwhIuxioZAaBoWKsrd7fWHxdr93BeDc9TP kjTmMwEZLUU8O/fPzeJQWeeP9i0R6mSs9l4raLskxyyup76u0qZEBGgPbEoML3VFFHa6 WofAHqypTlQmCQ/F/OQkbs4hdiqBqsEyn0GgJmGKTcj2ZjwVMpl2pwKtpiAPQ3GGdWC3 qJqh5kfps635WTYMEIoDpZ64IO/WA5h+EJ1cp/YpJ154VScMWzvjLJHHizy3Xr7KMHPg 6SsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PkMG+K9H+pGjfaEipJupWJDRprpXoKUTvkDrtSa1M8g=; b=MOVx3dAS40RcheM6fmkpJpAD7llSGNMRNmnXtHIP5w4wKBD4ROt8Lr0tu1wLgdF04o CfVL4ZXU85ZLc6JlioIQ/oS8Sbk/GcIqwhvkt88e8e716tngJxwpSlWD3Sp4L76er31X fVIFZCH9EAOSjRP6Yce2piLjBrfrC+xEIUVDR+lzupCv3CR1HS2W6vm6GhpsoGosn4N2 ZAW2x1hVf5GpXvDy6K9gNAmVmjj67ipV/nTZh2MdOfYJ7AZkJTNIEJ8oMppJaxMogbQQ pkO+Kz/V5xFypukoKWZOm9tDkK9Mq67kKf2b6Om+R/W+8oU+wv4SfGoF2v81NrgK9LSP tIZg== X-Gm-Message-State: AFqh2kqMmU1L7OH4K7JrHvOnK7vo3YUiJK9aVwYdkMYkFFcCQ9KipRZF eMZ5asPcLR8U036EbzmBYIcGPg== X-Google-Smtp-Source: AMrXdXu1IleT136NrHXp3lHCSqJTP6yDYCaHheatX5Nh4H6MXzVys56QlzDljZV4JOnHncdLrkM9LQ== X-Received: by 2002:a05:6512:1054:b0:4bb:70b2:6f50 with SMTP id c20-20020a056512105400b004bb70b26f50mr17354617lfb.52.1673035831982; Fri, 06 Jan 2023 12:10:31 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:31 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 02/11] interconnect: qcom: sc7180: drop IP0 remnants Date: Fri, 6 Jan 2023 22:10:19 +0200 Message-Id: <20230106201028.1809541-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Drop two defines leftover from the commit 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0 interconnects"), which dropped handling of the IP0 resource in favour of handling it in the clk-rpmh driver. Fixes: 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0 interconnects") Signed-off-by: Dmitry Baryshkov --- drivers/interconnect/qcom/sc7180.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/interconnect/qcom/sc7180.h b/drivers/interconnect/qcom/sc7180.h index c6212a10c2f6..7a2b3eb00923 100644 --- a/drivers/interconnect/qcom/sc7180.h +++ b/drivers/interconnect/qcom/sc7180.h @@ -11,7 +11,7 @@ #define SC7180_MASTER_APPSS_PROC 0 #define SC7180_MASTER_SYS_TCU 1 #define SC7180_MASTER_NPU_SYS 2 -#define SC7180_MASTER_IPA_CORE 3 +/* 3 was used by MASTER_IPA_CORE, now represented as RPMh clock */ #define SC7180_MASTER_LLCC 4 #define SC7180_MASTER_A1NOC_CFG 5 #define SC7180_MASTER_A2NOC_CFG 6 @@ -58,7 +58,7 @@ #define SC7180_MASTER_USB3 47 #define SC7180_MASTER_EMMC 48 #define SC7180_SLAVE_EBI1 49 -#define SC7180_SLAVE_IPA_CORE 50 +/* 50 was used by SLAVE_IPA_CORE, now represented as RPMh clock */ #define SC7180_SLAVE_A1NOC_CFG 51 #define SC7180_SLAVE_A2NOC_CFG 52 #define SC7180_SLAVE_AHB2PHY_SOUTH 53 From patchwork Fri Jan 6 20:10:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091758 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9CAAC64981 for ; Fri, 6 Jan 2023 20:11:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236270AbjAFUKz (ORCPT ); Fri, 6 Jan 2023 15:10:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236412AbjAFUKg (ORCPT ); Fri, 6 Jan 2023 15:10:36 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7753F8409E for ; Fri, 6 Jan 2023 12:10:34 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id bq39so3579817lfb.0 for ; Fri, 06 Jan 2023 12:10:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZoFX+uyNvirhCPaMd+M/V/XROMnpJsVx6sr6S5ADEQk=; b=H6uTi7WKEGeSsTq+A4b7zFaDmj+mpHg5GeEZfTeeUCMTk5FhKXfb1MPjkXw9Ed6Ujj q1YoDG5acoSuFdnaAObyxwZCjcKGdIAo4QIdzgy3wyaa8JYaAhv9SMNaMidNHm0dp9We 1Zh40exHdwiVkyxv4/0jMsmOPYCdS1rS9jQkwQqgCSCLcI5e7fvgnYiThoMpayuINzJJ gNU38tHc2uAUMNAIRyFmrzLwtfZuoxb9UrxBdSI3/rVfwvFSOVfuiS7MIeZ0NzjVVQ7s 162/KA5AFeMujbOUwb4AokHFEcbfSuDOgufsrOpDg7osZS9yDkRluBiF3PNIsU5DFTg3 UsVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZoFX+uyNvirhCPaMd+M/V/XROMnpJsVx6sr6S5ADEQk=; b=sZsoZtSXxr22i7D6NI9YmhqIXMmtpv5A8w6lTCLQ+oRKafoIie6uNbVkCn+SBSr6u1 g0JFaD4V/OozIEiHp3fB2sOA9XTNpWrYFAF2lsQw5C5TNF/addOVuYKAWdr5Dv8+VGBp m8vmpywpREFDJHctwxyLyTx12DBse+alZclY2A3gOOBKPNbOH0s9ki7ffsN/A/UTEcbO IVAeCFTAQj8PI/Q5wjWPtcCZnsv0hJOl2LXrsXpdrUkAZ9/Iby+j0ghViIV6gSuFFAxg ZAxDBEuf37Zi0XnOenlh+3ZPosJgRV5nlnRthpJbHMEzE92l4cY5R1brrkElNaMl/vxo Bs9Q== X-Gm-Message-State: AFqh2koZQ9FMzihtnwo1wfeSTComT+FWY8oYftdm/WzPsoaIEq/e2QZ1 t9YXBe7F9qjzMAK47PXauINYXw== X-Google-Smtp-Source: AMrXdXt8/GGN2rQ0UPbKUZA/oMyGuRwUs6LIM9WpUnKXK0RkwdZmR7eLo/yBQHJcZBRcryjHrwG+7A== X-Received: by 2002:ac2:5fad:0:b0:4b5:964d:499e with SMTP id s13-20020ac25fad000000b004b5964d499emr15319959lfe.8.1673035832777; Fri, 06 Jan 2023 12:10:32 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:32 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 03/11] interconnect: qcom: sm8150: Drop IP0 interconnects Date: Fri, 6 Jan 2023 22:10:20 +0200 Message-Id: <20230106201028.1809541-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Similar to the sdx55 and sc7180, let's drop the MASTER_IPA_CORE and SLAVE_IPA_CORE interconnects for this platofm. There are no actual users of this intercoonect. The IP0 resource will be handled by clk-rpmh driver. Signed-off-by: Dmitry Baryshkov --- drivers/interconnect/core.c | 1 + drivers/interconnect/qcom/sm8150.c | 21 --------------------- drivers/interconnect/qcom/sm8150.h | 4 ++-- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 25debded65a8..402db0c53a59 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -1086,6 +1086,7 @@ static int of_count_icc_providers(struct device_node *np) const struct of_device_id __maybe_unused ignore_list[] = { { .compatible = "qcom,sc7180-ipa-virt" }, { .compatible = "qcom,sdx55-ipa-virt" }, + { .compatible = "qcom,sm8150-ipa-virt" }, {} }; diff --git a/drivers/interconnect/qcom/sm8150.c b/drivers/interconnect/qcom/sm8150.c index 1d04a4bfea80..c5ab29322164 100644 --- a/drivers/interconnect/qcom/sm8150.c +++ b/drivers/interconnect/qcom/sm8150.c @@ -56,7 +56,6 @@ DEFINE_QNODE(qnm_pcie, SM8150_MASTER_GEM_NOC_PCIE_SNOC, 1, 16, SM8150_SLAVE_LLCC DEFINE_QNODE(qnm_snoc_gc, SM8150_MASTER_SNOC_GC_MEM_NOC, 1, 8, SM8150_SLAVE_LLCC); DEFINE_QNODE(qnm_snoc_sf, SM8150_MASTER_SNOC_SF_MEM_NOC, 1, 16, SM8150_SLAVE_LLCC); DEFINE_QNODE(qxm_ecc, SM8150_MASTER_ECC, 2, 32, SM8150_SLAVE_LLCC); -DEFINE_QNODE(ipa_core_master, SM8150_MASTER_IPA_CORE, 1, 8, SM8150_SLAVE_IPA_CORE); DEFINE_QNODE(llcc_mc, SM8150_MASTER_LLCC, 4, 4, SM8150_SLAVE_EBI_CH0); DEFINE_QNODE(qhm_mnoc_cfg, SM8150_MASTER_CNOC_MNOC_CFG, 1, 4, SM8150_SLAVE_SERVICE_MNOC); DEFINE_QNODE(qxm_camnoc_hf0, SM8150_MASTER_CAMNOC_HF0, 1, 32, SM8150_SLAVE_MNOC_HF_MEM_NOC); @@ -139,7 +138,6 @@ DEFINE_QNODE(qns_ecc, SM8150_SLAVE_ECC, 1, 32); DEFINE_QNODE(qns_gem_noc_snoc, SM8150_SLAVE_GEM_NOC_SNOC, 1, 8, SM8150_MASTER_GEM_NOC_SNOC); DEFINE_QNODE(qns_llcc, SM8150_SLAVE_LLCC, 4, 16, SM8150_MASTER_LLCC); DEFINE_QNODE(srvc_gemnoc, SM8150_SLAVE_SERVICE_GEM_NOC, 1, 4); -DEFINE_QNODE(ipa_core_slave, SM8150_SLAVE_IPA_CORE, 1, 8); DEFINE_QNODE(ebi, SM8150_SLAVE_EBI_CH0, 4, 4); DEFINE_QNODE(qns2_mem_noc, SM8150_SLAVE_MNOC_SF_MEM_NOC, 1, 32, SM8150_MASTER_MNOC_SF_MEM_NOC); DEFINE_QNODE(qns_mem_noc_hf, SM8150_SLAVE_MNOC_HF_MEM_NOC, 2, 32, SM8150_MASTER_MNOC_HF_MEM_NOC); @@ -172,7 +170,6 @@ DEFINE_QBCM(bcm_co0, "CO0", false, &qns_cdsp_mem_noc); DEFINE_QBCM(bcm_ce0, "CE0", false, &qxm_crypto); DEFINE_QBCM(bcm_sn1, "SN1", false, &qxs_imem); DEFINE_QBCM(bcm_co1, "CO1", false, &qnm_npu); -DEFINE_QBCM(bcm_ip0, "IP0", false, &ipa_core_slave); DEFINE_QBCM(bcm_cn0, "CN0", true, &qhm_spdm, &qnm_snoc, &qhs_a1_noc_cfg, &qhs_a2_noc_cfg, &qhs_ahb2phy_south, &qhs_aop, &qhs_aoss, &qhs_camera_cfg, &qhs_clk_ctl, &qhs_compute_dsp, &qhs_cpr_cx, &qhs_cpr_mmcx, &qhs_cpr_mx, &qhs_crypto0_cfg, &qhs_ddrss_cfg, &qhs_display_cfg, &qhs_emac_cfg, &qhs_glm, &qhs_gpuss_cfg, &qhs_imem_cfg, &qhs_ipa, &qhs_mnoc_cfg, &qhs_npu_cfg, &qhs_pcie0_cfg, &qhs_pcie1_cfg, &qhs_phy_refgen_north, &qhs_pimem_cfg, &qhs_prng, &qhs_qdss_cfg, &qhs_qspi, &qhs_qupv3_east, &qhs_qupv3_north, &qhs_qupv3_south, &qhs_sdc2, &qhs_sdc4, &qhs_snoc_cfg, &qhs_spdm, &qhs_spss_cfg, &qhs_ssc_cfg, &qhs_tcsr, &qhs_tlmm_east, &qhs_tlmm_north, &qhs_tlmm_south, &qhs_tlmm_west, &qhs_tsif, &qhs_ufs_card_cfg, &qhs_ufs_mem_cfg, &qhs_usb3_0, &qhs_usb3_1, &qhs_venus_cfg, &qhs_vsense_ctrl_cfg, &qns_cnoc_a2noc, &srvc_cnoc); DEFINE_QBCM(bcm_qup0, "QUP0", false, &qhm_qup0, &qhm_qup1, &qhm_qup2); DEFINE_QBCM(bcm_sn2, "SN2", false, &qns_gemnoc_gc); @@ -398,22 +395,6 @@ static const struct qcom_icc_desc sm8150_gem_noc = { .num_bcms = ARRAY_SIZE(gem_noc_bcms), }; -static struct qcom_icc_bcm * const ipa_virt_bcms[] = { - &bcm_ip0, -}; - -static struct qcom_icc_node * const ipa_virt_nodes[] = { - [MASTER_IPA_CORE] = &ipa_core_master, - [SLAVE_IPA_CORE] = &ipa_core_slave, -}; - -static const struct qcom_icc_desc sm8150_ipa_virt = { - .nodes = ipa_virt_nodes, - .num_nodes = ARRAY_SIZE(ipa_virt_nodes), - .bcms = ipa_virt_bcms, - .num_bcms = ARRAY_SIZE(ipa_virt_bcms), -}; - static struct qcom_icc_bcm * const mc_virt_bcms[] = { &bcm_acv, &bcm_mc0, @@ -517,8 +498,6 @@ static const struct of_device_id qnoc_of_match[] = { .data = &sm8150_dc_noc}, { .compatible = "qcom,sm8150-gem-noc", .data = &sm8150_gem_noc}, - { .compatible = "qcom,sm8150-ipa-virt", - .data = &sm8150_ipa_virt}, { .compatible = "qcom,sm8150-mc-virt", .data = &sm8150_mc_virt}, { .compatible = "qcom,sm8150-mmss-noc", diff --git a/drivers/interconnect/qcom/sm8150.h b/drivers/interconnect/qcom/sm8150.h index 97996f64d799..023161681fb8 100644 --- a/drivers/interconnect/qcom/sm8150.h +++ b/drivers/interconnect/qcom/sm8150.h @@ -35,7 +35,7 @@ #define SM8150_MASTER_GPU_TCU 24 #define SM8150_MASTER_GRAPHICS_3D 25 #define SM8150_MASTER_IPA 26 -#define SM8150_MASTER_IPA_CORE 27 +/* 27 was used by SLAVE_IPA_CORE, now represented as RPMh clock */ #define SM8150_MASTER_LLCC 28 #define SM8150_MASTER_MDP_PORT0 29 #define SM8150_MASTER_MDP_PORT1 30 @@ -94,7 +94,7 @@ #define SM8150_SLAVE_GRAPHICS_3D_CFG 83 #define SM8150_SLAVE_IMEM_CFG 84 #define SM8150_SLAVE_IPA_CFG 85 -#define SM8150_SLAVE_IPA_CORE 86 +/* 86 was used by SLAVE_IPA_CORE, now represented as RPMh clock */ #define SM8150_SLAVE_LLCC 87 #define SM8150_SLAVE_LLCC_CFG 88 #define SM8150_SLAVE_MNOC_HF_MEM_NOC 89 From patchwork Fri Jan 6 20:10:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091764 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49223C71133 for ; Fri, 6 Jan 2023 20:11:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235727AbjAFULG (ORCPT ); Fri, 6 Jan 2023 15:11:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236408AbjAFUKf (ORCPT ); Fri, 6 Jan 2023 15:10:35 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5518884098 for ; Fri, 6 Jan 2023 12:10:34 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id bu8so3533876lfb.4 for ; Fri, 06 Jan 2023 12:10:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7lZHLNPVwyb782Y1Pdyp+yigSMTuvcxhWD4r28OM7ZI=; b=nT/qpDbest9vFGbs/3dTZ4tv9t7gfhyfZHSufj98rI5240UJiXhIyMSDTuKC5OPgUM JOcFsXHNyacFxgtIcEBax/VNnwGDXA654fosrMsuOWkXrgrUDipRBbppvUtPCIicBX+J UuQyG2Yex5BEcUNllJ/61InJ0jaG7nYCmh9et6VU38V701pKngI+7YuqtE7Yrh4Z7yg+ UB/7FXZTbS7NaNu4PBwrrXFBBh6YZbbeWdqHbLzLwt5+6vq8a1qBIxcbz17ejiOGSC/E EkElE3pURpxUyLv/4DYSxdoE0Uqu5c4BbyNFQw2dnP1uPGWiAamE9SuiwMhKcRrL7jX7 0OTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7lZHLNPVwyb782Y1Pdyp+yigSMTuvcxhWD4r28OM7ZI=; b=ZUPL/jMDj2rvPjtbQEazuaCEUiRGdlpVxA/mwH9O2znpC4hviuLr5gJjbdr5HSlBJm cxaw+LwVDX1NdMtfTY9r4hun+PI3hL89CoOibz3gmn/eqryntyJPrYXWgeLoW1h8i2N1 8zKXBcAawzk9mn+REuLaISGKBqf+RbH/KnIP2Itx1/FlRexSI+XQWaYEXq1zvjfda2xM 2dstPsBYBFhPQjBoCL34FiAHIoaFrRzv1e7YPHQ5Y2bzeeE8oy1EZUYBN2zzNzlX+RjM 7kjvj/i9kwgTgWrtcXkMGTuFQLFuxhKpAoOMqolpNNzwWFFmpxXf+qXKhM7Cn5q0rpPs dTCw== X-Gm-Message-State: AFqh2kpU1L13wNOO26qT2MN1T2LeyLRIHDT4CBZSv4zBxH9E+D5qUfXD Ec5w/BLr/LBPR40ARvHpZq+ahg== X-Google-Smtp-Source: AMrXdXuebx3Jum0oZe4fRts+d1EMAxx/VEPOxMRvGdsC0LvKv9c3BY2MSWluL1n6PMYflxCyEJ5+0w== X-Received: by 2002:a05:6512:b9d:b0:4cb:6a4:ec77 with SMTP id b29-20020a0565120b9d00b004cb06a4ec77mr14120450lfv.4.1673035833879; Fri, 06 Jan 2023 12:10:33 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:33 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 04/11] interconnect: qcom: sm8250: Drop IP0 interconnects Date: Fri, 6 Jan 2023 22:10:21 +0200 Message-Id: <20230106201028.1809541-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Similar to the sdx55 and sc7180, let's drop the MASTER_IPA_CORE and SLAVE_IPA_CORE interconnects for this platofm. There are no actual users of this intercoonect. The IP0 resource will be handled by clk-rpmh driver. Signed-off-by: Dmitry Baryshkov --- drivers/interconnect/core.c | 1 + drivers/interconnect/qcom/sm8250.c | 21 --------------------- drivers/interconnect/qcom/sm8250.h | 4 ++-- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 402db0c53a59..3ec92e81053a 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -1087,6 +1087,7 @@ static int of_count_icc_providers(struct device_node *np) { .compatible = "qcom,sc7180-ipa-virt" }, { .compatible = "qcom,sdx55-ipa-virt" }, { .compatible = "qcom,sm8150-ipa-virt" }, + { .compatible = "qcom,sm8250-ipa-virt" }, {} }; diff --git a/drivers/interconnect/qcom/sm8250.c b/drivers/interconnect/qcom/sm8250.c index 5cdb058fa095..e3bb008cb219 100644 --- a/drivers/interconnect/qcom/sm8250.c +++ b/drivers/interconnect/qcom/sm8250.c @@ -51,7 +51,6 @@ DEFINE_QNODE(qnm_mnoc_sf, SM8250_MASTER_MNOC_SF_MEM_NOC, 2, 32, SM8250_SLAVE_LLC DEFINE_QNODE(qnm_pcie, SM8250_MASTER_ANOC_PCIE_GEM_NOC, 1, 16, SM8250_SLAVE_LLCC, SM8250_SLAVE_GEM_NOC_SNOC); DEFINE_QNODE(qnm_snoc_gc, SM8250_MASTER_SNOC_GC_MEM_NOC, 1, 8, SM8250_SLAVE_LLCC); DEFINE_QNODE(qnm_snoc_sf, SM8250_MASTER_SNOC_SF_MEM_NOC, 1, 16, SM8250_SLAVE_LLCC, SM8250_SLAVE_GEM_NOC_SNOC, SM8250_SLAVE_MEM_NOC_PCIE_SNOC); -DEFINE_QNODE(ipa_core_master, SM8250_MASTER_IPA_CORE, 1, 8, SM8250_SLAVE_IPA_CORE); DEFINE_QNODE(llcc_mc, SM8250_MASTER_LLCC, 4, 4, SM8250_SLAVE_EBI_CH0); DEFINE_QNODE(qhm_mnoc_cfg, SM8250_MASTER_CNOC_MNOC_CFG, 1, 4, SM8250_SLAVE_SERVICE_MNOC); DEFINE_QNODE(qnm_camnoc_hf, SM8250_MASTER_CAMNOC_HF, 2, 32, SM8250_SLAVE_MNOC_HF_MEM_NOC); @@ -138,7 +137,6 @@ DEFINE_QNODE(qns_sys_pcie, SM8250_SLAVE_MEM_NOC_PCIE_SNOC, 1, 8, SM8250_MASTER_G DEFINE_QNODE(srvc_even_gemnoc, SM8250_SLAVE_SERVICE_GEM_NOC_1, 1, 4); DEFINE_QNODE(srvc_odd_gemnoc, SM8250_SLAVE_SERVICE_GEM_NOC_2, 1, 4); DEFINE_QNODE(srvc_sys_gemnoc, SM8250_SLAVE_SERVICE_GEM_NOC, 1, 4); -DEFINE_QNODE(ipa_core_slave, SM8250_SLAVE_IPA_CORE, 1, 8); DEFINE_QNODE(ebi, SM8250_SLAVE_EBI_CH0, 4, 4); DEFINE_QNODE(qns_mem_noc_hf, SM8250_SLAVE_MNOC_HF_MEM_NOC, 2, 32, SM8250_MASTER_MNOC_HF_MEM_NOC); DEFINE_QNODE(qns_mem_noc_sf, SM8250_SLAVE_MNOC_SF_MEM_NOC, 2, 32, SM8250_MASTER_MNOC_SF_MEM_NOC); @@ -171,7 +169,6 @@ DEFINE_QBCM(bcm_mc0, "MC0", true, &ebi); DEFINE_QBCM(bcm_sh0, "SH0", true, &qns_llcc); DEFINE_QBCM(bcm_mm0, "MM0", true, &qns_mem_noc_hf); DEFINE_QBCM(bcm_ce0, "CE0", false, &qxm_crypto); -DEFINE_QBCM(bcm_ip0, "IP0", false, &ipa_core_slave); DEFINE_QBCM(bcm_mm1, "MM1", false, &qnm_camnoc_hf, &qxm_mdp0, &qxm_mdp1); DEFINE_QBCM(bcm_sh2, "SH2", false, &alm_gpu_tcu, &alm_sys_tcu); DEFINE_QBCM(bcm_mm2, "MM2", false, &qns_mem_noc_sf); @@ -386,22 +383,6 @@ static const struct qcom_icc_desc sm8250_gem_noc = { .num_bcms = ARRAY_SIZE(gem_noc_bcms), }; -static struct qcom_icc_bcm * const ipa_virt_bcms[] = { - &bcm_ip0, -}; - -static struct qcom_icc_node * const ipa_virt_nodes[] = { - [MASTER_IPA_CORE] = &ipa_core_master, - [SLAVE_IPA_CORE] = &ipa_core_slave, -}; - -static const struct qcom_icc_desc sm8250_ipa_virt = { - .nodes = ipa_virt_nodes, - .num_nodes = ARRAY_SIZE(ipa_virt_nodes), - .bcms = ipa_virt_bcms, - .num_bcms = ARRAY_SIZE(ipa_virt_bcms), -}; - static struct qcom_icc_bcm * const mc_virt_bcms[] = { &bcm_acv, &bcm_mc0, @@ -531,8 +512,6 @@ static const struct of_device_id qnoc_of_match[] = { .data = &sm8250_dc_noc}, { .compatible = "qcom,sm8250-gem-noc", .data = &sm8250_gem_noc}, - { .compatible = "qcom,sm8250-ipa-virt", - .data = &sm8250_ipa_virt}, { .compatible = "qcom,sm8250-mc-virt", .data = &sm8250_mc_virt}, { .compatible = "qcom,sm8250-mmss-noc", diff --git a/drivers/interconnect/qcom/sm8250.h b/drivers/interconnect/qcom/sm8250.h index b31fb431a20f..e3fc56bc7ca0 100644 --- a/drivers/interconnect/qcom/sm8250.h +++ b/drivers/interconnect/qcom/sm8250.h @@ -31,7 +31,7 @@ #define SM8250_MASTER_GPU_TCU 20 #define SM8250_MASTER_GRAPHICS_3D 21 #define SM8250_MASTER_IPA 22 -#define SM8250_MASTER_IPA_CORE 23 +/* 23 was used by MASTER_IPA_CORE, now represented as RPMh clock */ #define SM8250_MASTER_LLCC 24 #define SM8250_MASTER_MDP_PORT0 25 #define SM8250_MASTER_MDP_PORT1 26 @@ -92,7 +92,7 @@ #define SM8250_SLAVE_GRAPHICS_3D_CFG 81 #define SM8250_SLAVE_IMEM_CFG 82 #define SM8250_SLAVE_IPA_CFG 83 -#define SM8250_SLAVE_IPA_CORE 84 +/* 84 was used by SLAVE_IPA_CORE, now represented as RPMh clock */ #define SM8250_SLAVE_IPC_ROUTER_CFG 85 #define SM8250_SLAVE_ISENSE_CFG 86 #define SM8250_SLAVE_LLCC 87 From patchwork Fri Jan 6 20:10:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091760 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 514EAC678D7 for ; Fri, 6 Jan 2023 20:11:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236337AbjAFULA (ORCPT ); Fri, 6 Jan 2023 15:11:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236436AbjAFUKh (ORCPT ); Fri, 6 Jan 2023 15:10:37 -0500 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42E6A8408F for ; Fri, 6 Jan 2023 12:10:36 -0800 (PST) Received: by mail-lf1-x12f.google.com with SMTP id m6so3500351lfj.11 for ; Fri, 06 Jan 2023 12:10:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=g6TNfDCQu0nivTzIywF2b+dmNFWya/YhuUF/KVZDFuc=; b=rMGavsMpuT+RTRknUGQ2e98lKOgC3z169lRCSRko9/2jlwNDooq7Sp7B8wzKaLjBfd awTK8lFTS9PdbyEDygd0hLwoi9pCqvu168dIqPeqIvAFxZv9rrgCxQDmjvOJtUgDD4QO uxs3MBXu5mMYhicwjfhH8I2rkYGOFa6T/H1mbTS5XI8UYICZUXehszluolA6wiai+gO4 U0CfDRbehs0gzcvAsOvFHXzIVcGnxJjlh83swGSF346wLJHn2Oxnw4xgx+bCvHaFeaa4 PU6fjWzy2hMFc6IDh/grh/WbDRolmTz+9AUIbDWZP0g84RZn4AmZus4xLevFrW5iyd5c QksQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g6TNfDCQu0nivTzIywF2b+dmNFWya/YhuUF/KVZDFuc=; b=BzREAoYPzkDpMjw5Q4CcPQ/26yIDn3It1wqCshRcjziP9+FI19/hbuOaoOuE441ClB 7mnGSdTKPrAeuHXVcY7YYaxUzjnISwn31E8FLAjrvrIMNpq0rSSf58WdOqYE3qRW7aU8 tUM1FRixLGhkaJgE67xNwzy1rvJOxoQ/fdpEMBF3bUk53T2MqcnoIKgAIgDmU1uxZMuh zwMcFEp/4COLG9hk8zsTjQr1FnFJaK8jejn8Z1uTCeoEixLugdSzd8nqGzyajx5FHdL+ P4Knc2bCaWjeMektJAamT+XJ1dDbImCkBliuqw20BimeqFOYF/fCSO85xT/04mlGxIl/ 3bnQ== X-Gm-Message-State: AFqh2kp2Wwh7SpIRuwkBxS7yXYo2tmh73Dh/9WWiW1+2tzrF0lo40UHL wAzNyVbR2zzFIVEgSvW/A8LhEA== X-Google-Smtp-Source: AMrXdXupjRSMEfpA7amkTCP6oNBElyegH0AVvNXYtN0SZ0XW2wKTwQJ8Jp44Bu4WzeZ0Mfd2Q3V/tg== X-Received: by 2002:ac2:4bd3:0:b0:4b4:a460:c995 with SMTP id o19-20020ac24bd3000000b004b4a460c995mr22439760lfq.5.1673035834665; Fri, 06 Jan 2023 12:10:34 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:34 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 05/11] interconnect: qcom: sc8180x: Drop IP0 interconnects Date: Fri, 6 Jan 2023 22:10:22 +0200 Message-Id: <20230106201028.1809541-6-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Similar to the sdx55 and sc7180, let's drop the MASTER_IPA_CORE and SLAVE_IPA_CORE interconnects for this platofm. There are no actual users of this intercoonect. The IP0 resource will be handled by clk-rpmh driver. Signed-off-by: Dmitry Baryshkov --- drivers/interconnect/core.c | 1 + drivers/interconnect/qcom/sc8180x.c | 38 ----------------------------- drivers/interconnect/qcom/sc8180x.h | 4 +-- 3 files changed, 3 insertions(+), 40 deletions(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 3ec92e81053a..7230db81e0db 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -1085,6 +1085,7 @@ static int of_count_icc_providers(struct device_node *np) int count = 0; const struct of_device_id __maybe_unused ignore_list[] = { { .compatible = "qcom,sc7180-ipa-virt" }, + { .compatible = "qcom,sc8180x-ipa-virt" }, { .compatible = "qcom,sdx55-ipa-virt" }, { .compatible = "qcom,sm8150-ipa-virt" }, { .compatible = "qcom,sm8250-ipa-virt" }, diff --git a/drivers/interconnect/qcom/sc8180x.c b/drivers/interconnect/qcom/sc8180x.c index 0f515bf10bd7..c76e3a6a98cd 100644 --- a/drivers/interconnect/qcom/sc8180x.c +++ b/drivers/interconnect/qcom/sc8180x.c @@ -469,15 +469,6 @@ static struct qcom_icc_node mas_qxm_ecc = { .links = { SC8180X_SLAVE_LLCC } }; -static struct qcom_icc_node mas_ipa_core_master = { - .name = "mas_ipa_core_master", - .id = SC8180X_MASTER_IPA_CORE, - .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SC8180X_SLAVE_IPA_CORE } -}; - static struct qcom_icc_node mas_llcc_mc = { .name = "mas_llcc_mc", .id = SC8180X_MASTER_LLCC, @@ -1201,13 +1192,6 @@ static struct qcom_icc_node slv_srvc_gemnoc1 = { .buswidth = 4 }; -static struct qcom_icc_node slv_ipa_core_slave = { - .name = "slv_ipa_core_slave", - .id = SC8180X_SLAVE_IPA_CORE, - .channels = 1, - .buswidth = 8 -}; - static struct qcom_icc_node slv_ebi = { .name = "slv_ebi", .id = SC8180X_SLAVE_EBI_CH0, @@ -1524,11 +1508,6 @@ static struct qcom_icc_bcm bcm_co2 = { .nodes = { &mas_qnm_npu } }; -static struct qcom_icc_bcm bcm_ip0 = { - .name = "IP0", - .nodes = { &slv_ipa_core_slave } -}; - static struct qcom_icc_bcm bcm_sn3 = { .name = "SN3", .keepalive = true, @@ -1604,10 +1583,6 @@ static struct qcom_icc_bcm * const gem_noc_bcms[] = { &bcm_sh3, }; -static struct qcom_icc_bcm * const ipa_virt_bcms[] = { - &bcm_ip0, -}; - static struct qcom_icc_bcm * const mc_virt_bcms[] = { &bcm_mc0, &bcm_acv, @@ -1766,11 +1741,6 @@ static struct qcom_icc_node * const gem_noc_nodes[] = { [SLAVE_SERVICE_GEM_NOC_1] = &slv_srvc_gemnoc1, }; -static struct qcom_icc_node * const ipa_virt_nodes[] = { - [MASTER_IPA_CORE] = &mas_ipa_core_master, - [SLAVE_IPA_CORE] = &slv_ipa_core_slave, -}; - static struct qcom_icc_node * const mc_virt_nodes[] = { [MASTER_LLCC] = &mas_llcc_mc, [SLAVE_EBI_CH0] = &slv_ebi, @@ -1857,13 +1827,6 @@ static const struct qcom_icc_desc sc8180x_gem_noc = { .num_bcms = ARRAY_SIZE(gem_noc_bcms), }; -static const struct qcom_icc_desc sc8180x_ipa_virt = { - .nodes = ipa_virt_nodes, - .num_nodes = ARRAY_SIZE(ipa_virt_nodes), - .bcms = ipa_virt_bcms, - .num_bcms = ARRAY_SIZE(ipa_virt_bcms), -}; - static const struct qcom_icc_desc sc8180x_mc_virt = { .nodes = mc_virt_nodes, .num_nodes = ARRAY_SIZE(mc_virt_nodes), @@ -1913,7 +1876,6 @@ static const struct of_device_id qnoc_of_match[] = { { .compatible = "qcom,sc8180x-config-noc", .data = &sc8180x_config_noc }, { .compatible = "qcom,sc8180x-dc-noc", .data = &sc8180x_dc_noc }, { .compatible = "qcom,sc8180x-gem-noc", .data = &sc8180x_gem_noc }, - { .compatible = "qcom,sc8180x-ipa-virt", .data = &sc8180x_ipa_virt }, { .compatible = "qcom,sc8180x-mc-virt", .data = &sc8180x_mc_virt }, { .compatible = "qcom,sc8180x-mmss-noc", .data = &sc8180x_mmss_noc }, { .compatible = "qcom,sc8180x-qup-virt", .data = &sc8180x_qup_virt }, diff --git a/drivers/interconnect/qcom/sc8180x.h b/drivers/interconnect/qcom/sc8180x.h index 2eafd35543c7..c138dcd350f1 100644 --- a/drivers/interconnect/qcom/sc8180x.h +++ b/drivers/interconnect/qcom/sc8180x.h @@ -51,7 +51,7 @@ #define SC8180X_MASTER_SNOC_GC_MEM_NOC 41 #define SC8180X_MASTER_SNOC_SF_MEM_NOC 42 #define SC8180X_MASTER_ECC 43 -#define SC8180X_MASTER_IPA_CORE 44 +/* 44 was used by MASTER_IPA_CORE, now represented as RPMh clock */ #define SC8180X_MASTER_LLCC 45 #define SC8180X_MASTER_CNOC_MNOC_CFG 46 #define SC8180X_MASTER_CAMNOC_HF0 47 @@ -146,7 +146,7 @@ #define SC8180X_SLAVE_LLCC 136 #define SC8180X_SLAVE_SERVICE_GEM_NOC 137 #define SC8180X_SLAVE_SERVICE_GEM_NOC_1 138 -#define SC8180X_SLAVE_IPA_CORE 139 +/* 139 was used by SLAVE_IPA_CORE, now represented as RPMh clock */ #define SC8180X_SLAVE_EBI_CH0 140 #define SC8180X_SLAVE_MNOC_SF_MEM_NOC 141 #define SC8180X_SLAVE_MNOC_HF_MEM_NOC 142 From patchwork Fri Jan 6 20:10:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091766 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FE18C71149 for ; Fri, 6 Jan 2023 20:11:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235748AbjAFULM (ORCPT ); Fri, 6 Jan 2023 15:11:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236434AbjAFUKh (ORCPT ); Fri, 6 Jan 2023 15:10:37 -0500 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 109EF840A7 for ; Fri, 6 Jan 2023 12:10:36 -0800 (PST) Received: by mail-lf1-x12c.google.com with SMTP id bp15so3496950lfb.13 for ; Fri, 06 Jan 2023 12:10:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9ill0/wzsh4ASoh+xaOta7TBlS3WIkzNzN32uocpWXo=; b=X6qNE3UcNwIDE86fIGGBCJqBKle+m44uj4ajoGGDOj+SN5pyfvOToy9a+6eozMVRqn oQ9pwl4ya5rFs4EipPqULKjCd6x1seP/Kc0bTtz+dRA68kFKipR8ayJP3w0lto/8OYfo g6rl7Jo7n3OCNrhXKsFznqwel8FWM949Egdbra0b7u7lg85Etsu8nbrt4EMPhkfQTIc+ DpVaDseXSy3cZOpyNFIxBOR6SV+zH5Hca9kwFi9+hSLkGue1tNfHAyeT/DmX3v1dJrQb RxZuiG1yxJtrBGcMg7VPyf+i+c8RQ4AeHJD8jzDRIFEflyFruqyP+Oe+pjHNR8g1hNIJ M34Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9ill0/wzsh4ASoh+xaOta7TBlS3WIkzNzN32uocpWXo=; b=pKGkJbn0fUFdnAbG/aBRTs+i93eWaFbzBKQ8PLOtWi3Fje0/lMHilqfT0dKcL80vaF uI1tmS07pZHnrXV7QeF3hX3ZWxbZufIzmiEinEY5isih+MZpZOLF5FxTqLVog2l05Fi0 xJyCbjk/xOw9Rs3/8cB902r+rp3gLiSQLIOxvKwFUjKWCX4R5zlt7r4m/EODtRli+TRz kd7Y0QyX7efjbPHQQr3iNFrpa5lygB9WA4zl1rX/yE19T0V9THyKLBUwygLvVp8sYw+b jKuZQ5wYhxv5QXDR+9Pc+ixjPNykzsILG8cI36J41R3DNp2JueVgvqulAw2lgIMTKxZm hYrg== X-Gm-Message-State: AFqh2kr6nlW9jVCV0C1AIFBN/HLYVjKXPSgDrJD9Is6BgZmRRawI0Ug/ h2+DShV3uiP8vEVFUmewBaX+ig== X-Google-Smtp-Source: AMrXdXvFgU5Ftf+n21arffce7hFpX843/l8Bq1nmRAnRUo7d+UKiCUP0Y5L4n2ef+tEIv/FxcDBUkg== X-Received: by 2002:ac2:4898:0:b0:4b3:d6e1:26bb with SMTP id x24-20020ac24898000000b004b3d6e126bbmr15431577lfc.29.1673035835584; Fri, 06 Jan 2023 12:10:35 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:35 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 06/11] interconnect: qcom: sc8280xp: Drop IP0 interconnects Date: Fri, 6 Jan 2023 22:10:23 +0200 Message-Id: <20230106201028.1809541-7-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Similar to the sdx55 and sc7180, let's drop the MASTER_IPA_CORE and SLAVE_IPA_CORE interconnects for this platofm. There are no actual users of this intercoonect. The IP0 resource will be handled by clk-rpmh driver. Signed-off-by: Dmitry Baryshkov --- drivers/interconnect/qcom/sc8280xp.c | 25 ------------------------- drivers/interconnect/qcom/sc8280xp.h | 4 ++-- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/drivers/interconnect/qcom/sc8280xp.c b/drivers/interconnect/qcom/sc8280xp.c index 507fe5f89791..e56df893ec3e 100644 --- a/drivers/interconnect/qcom/sc8280xp.c +++ b/drivers/interconnect/qcom/sc8280xp.c @@ -284,15 +284,6 @@ static struct qcom_icc_node xm_ufs_card = { .links = { SC8280XP_SLAVE_A2NOC_SNOC }, }; -static struct qcom_icc_node ipa_core_master = { - .name = "ipa_core_master", - .id = SC8280XP_MASTER_IPA_CORE, - .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SC8280XP_SLAVE_IPA_CORE }, -}; - static struct qcom_icc_node qup0_core_master = { .name = "qup0_core_master", .id = SC8280XP_MASTER_QUP_CORE_0, @@ -882,13 +873,6 @@ static struct qcom_icc_node srvc_aggre2_noc = { .buswidth = 4, }; -static struct qcom_icc_node ipa_core_slave = { - .name = "ipa_core_slave", - .id = SC8280XP_SLAVE_IPA_CORE, - .channels = 1, - .buswidth = 8, -}; - static struct qcom_icc_node qup0_core_slave = { .name = "qup0_core_slave", .id = SC8280XP_SLAVE_QUP_CORE_0, @@ -1845,12 +1829,6 @@ static struct qcom_icc_bcm bcm_cn3 = { }, }; -static struct qcom_icc_bcm bcm_ip0 = { - .name = "IP0", - .num_nodes = 1, - .nodes = { &ipa_core_slave }, -}; - static struct qcom_icc_bcm bcm_mc0 = { .name = "MC0", .keepalive = true, @@ -2077,18 +2055,15 @@ static const struct qcom_icc_desc sc8280xp_aggre2_noc = { }; static struct qcom_icc_bcm * const clk_virt_bcms[] = { - &bcm_ip0, &bcm_qup0, &bcm_qup1, &bcm_qup2, }; static struct qcom_icc_node * const clk_virt_nodes[] = { - [MASTER_IPA_CORE] = &ipa_core_master, [MASTER_QUP_CORE_0] = &qup0_core_master, [MASTER_QUP_CORE_1] = &qup1_core_master, [MASTER_QUP_CORE_2] = &qup2_core_master, - [SLAVE_IPA_CORE] = &ipa_core_slave, [SLAVE_QUP_CORE_0] = &qup0_core_slave, [SLAVE_QUP_CORE_1] = &qup1_core_slave, [SLAVE_QUP_CORE_2] = &qup2_core_slave, diff --git a/drivers/interconnect/qcom/sc8280xp.h b/drivers/interconnect/qcom/sc8280xp.h index 74d8fa412d65..c5c410fd5ec3 100644 --- a/drivers/interconnect/qcom/sc8280xp.h +++ b/drivers/interconnect/qcom/sc8280xp.h @@ -10,7 +10,7 @@ #define SC8280XP_MASTER_PCIE_TCU 1 #define SC8280XP_MASTER_SYS_TCU 2 #define SC8280XP_MASTER_APPSS_PROC 3 -#define SC8280XP_MASTER_IPA_CORE 4 +/* 4 was used by SLAVE_IPA_CORE, now represented as RPMh clock */ #define SC8280XP_MASTER_LLCC 5 #define SC8280XP_MASTER_CNOC_LPASS_AG_NOC 6 #define SC8280XP_MASTER_CDSP_NOC_CFG 7 @@ -84,7 +84,7 @@ #define SC8280XP_MASTER_USB4_0 75 #define SC8280XP_MASTER_USB4_1 76 #define SC8280XP_SLAVE_EBI1 512 -#define SC8280XP_SLAVE_IPA_CORE 513 +/* 513 was used by SLAVE_IPA_CORE, now represented as RPMh clock */ #define SC8280XP_SLAVE_AHB2PHY_0 514 #define SC8280XP_SLAVE_AHB2PHY_1 515 #define SC8280XP_SLAVE_AHB2PHY_2 516 From patchwork Fri Jan 6 20:10:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091763 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB6BCC54EBD for ; Fri, 6 Jan 2023 20:11:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236414AbjAFULI (ORCPT ); Fri, 6 Jan 2023 15:11:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236498AbjAFUKj (ORCPT ); Fri, 6 Jan 2023 15:10:39 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B75C840AC for ; Fri, 6 Jan 2023 12:10:38 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id b3so3544243lfv.2 for ; Fri, 06 Jan 2023 12:10:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8FiMYGHFGXrVpyzi7ZgB2e/VL6pJCok4vFhR2XZcqc4=; b=JUzKPY0rOxYEoScq+vCPBpGWxw46pFyDPKQzMPkVs3mMlV98UUZa6kx7/gMaMG1nx4 ma3bhc2cxOf9nD4q+oHyPbrHbqEu+rzlc3S6xBk+JMMLHcKRy2aB6Pl/LG587gdW+WZx N9PtlTB9zTMvIlculJvg5wtc+7Ipg33Tygk45O++Rlsk3p3hBspLHFPAfsMlRKp+t9y1 qTTy6+MEZLGT63c+slkIhlszjZTsqcHV0uHRz1ORhwQh9wOP/OwSDjzeKztxyUqfWxkQ 77q0pXLfXK3vPW/DCKsyf7A9beCRk8quwWAB4yiuLSwWDpDkltOweudZFBqdeWy27BSZ 6w8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8FiMYGHFGXrVpyzi7ZgB2e/VL6pJCok4vFhR2XZcqc4=; b=jwBxTxzMyh4m4HYKnp7BSZ4y1/sVv0dl+i7mZBenH235drCQi0C1db8QDXneiC8dbU 3iKd5o4m0iZMNUi7Ys+NdMn6D808K6F3haHXGNAJDxQSP42atB+5Xn3fwCcTGtoWLkKz 6yn2fIsHiCh4SWh93n+cicwapw4svBsgNJtBkrbkkOt4HSUAHlF6VmYhTURhr4vVt9nV ca2YMpwYRNBTTky5XGXTYVocL4C+7mpYeR/oosy62Q5qgoeTf8vXLP3nHrzjgw9RU8/F /rpCJMQegKwueOpJpDwAVLmTDAtVCKEEBIVNJpbIPHXShKHnDMaS7DYvPOtr/I6Xt2Sl 8Olw== X-Gm-Message-State: AFqh2kpgob61N67fx7UkYW4J+i18FN5GBUn16fgoieSR4Bwb4MopB/Je HQDn4NnAov694jRN6fO28H6r5Q== X-Google-Smtp-Source: AMrXdXvhBuY8NLd4WpsgKBHFL7iB46rZozZNfykWp4gPNDsGWc2gdEE9G8snZXmrQHGyfVqoATHKRQ== X-Received: by 2002:a05:6512:3a8f:b0:4c8:5f19:ccb8 with SMTP id q15-20020a0565123a8f00b004c85f19ccb8mr16963723lfu.48.1673035836413; Fri, 06 Jan 2023 12:10:36 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:35 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, Krzysztof Kozlowski Subject: [PATCH v2 07/11] dt-bindings: interconnect: qcom: Remove ipa-virt compatibles Date: Fri, 6 Jan 2023 22:10:24 +0200 Message-Id: <20230106201028.1809541-8-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org These interconnects are going to be modeled as clockks, not interconnects. There are no other interconnects left on the virtual SoC-ipa-virt NoCs, therefore remove the compatibles from the binding as they're unused. Acked-by: Krzysztof Kozlowski Signed-off-by: Dmitry Baryshkov --- Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml index a429a1ed1006..4e8d950c2832 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml @@ -58,7 +58,6 @@ properties: - qcom,sc8180x-config-noc - qcom,sc8180x-dc-noc - qcom,sc8180x-gem-noc - - qcom,sc8180x-ipa-virt - qcom,sc8180x-mc-virt - qcom,sc8180x-mmss-noc - qcom,sc8180x-qup-virt @@ -96,7 +95,6 @@ properties: - qcom,sm8150-config-noc - qcom,sm8150-dc-noc - qcom,sm8150-gem-noc - - qcom,sm8150-ipa-virt - qcom,sm8150-mc-virt - qcom,sm8150-mmss-noc - qcom,sm8150-system-noc @@ -106,7 +104,6 @@ properties: - qcom,sm8250-config-noc - qcom,sm8250-dc-noc - qcom,sm8250-gem-noc - - qcom,sm8250-ipa-virt - qcom,sm8250-mc-virt - qcom,sm8250-mmss-noc - qcom,sm8250-npu-noc From patchwork Fri Jan 6 20:10:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091767 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C926C71147 for ; Fri, 6 Jan 2023 20:11:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236436AbjAFULL (ORCPT ); Fri, 6 Jan 2023 15:11:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236472AbjAFUKj (ORCPT ); Fri, 6 Jan 2023 15:10:39 -0500 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF1B884091 for ; Fri, 6 Jan 2023 12:10:37 -0800 (PST) Received: by mail-lf1-x12f.google.com with SMTP id j17so3540800lfr.3 for ; Fri, 06 Jan 2023 12:10:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RNfbSTvzTfUVFclyKhJFzlWhnbUuUQRODnFghZoCEPo=; b=Cpp6PbMszA8NXM5V/FLNTCCIQXOF4qxKXSNkgNa3UGHvtKFCDn5IirMlYMsVIEOu65 H0tQVJDVNY098LztdISe2BOZSbt/QtQTdjmd7t5aXUqV29HHRHY3lzOjw54z6i91RiJ/ g9VCOC1H+X1PdAFShPV4VYBBa6cmXHyAM76wa0IkewynxFrCdi5uV5CfaLbjLbuF1cB5 /box2ubN7qCIkd4i2ilqu/EoC40FLVHACdgi8ew8mAFIJTZ5RXYJro5KO7pHTv3i4Ge0 p+w86uDcXDYKxWb5GkuNoYTI2LVDrozT3CEPyvJJuNC+KNyhPy8+h1uG1ajDSJtr3eqS H7Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RNfbSTvzTfUVFclyKhJFzlWhnbUuUQRODnFghZoCEPo=; b=Xn+KLqoZDPewxTbPX3QIumQyhbxMAtYYsMaqwuBwAqV2vzsKs/7moEqwnPHr2fy2ZS G/7njotay5WhzcQa6QfahIwl1vsJCK5moEVMQUw20jIIIElQwXPsUKI0Ne4z1CodTebf 2beRBbTxOXkfygJEemD5RBtPS1bj7txc3lPk52F9oa/8vPf5k3xCd4U7w/BKylFlcYq9 Zuls/JOGKyD/2HJqxpdwWCAHShvpc1zMIzAm2HqssYJ2HBZOKScDcM5wqVvxt5Kld0YK MniDvZqc0BPTFph6lMROb1EiwaiTvRsqBbSWHkgFLx6/VdSb5pG9snupzneSmJSNFDpq +2Xg== X-Gm-Message-State: AFqh2koudA2TvcHXIMuYywYK7CowMyvatk2nxHfdYENUStDO8A3EV8tJ 9F0pqA+rqeoI7AqY7U+8Ow17xA== X-Google-Smtp-Source: AMrXdXsbIEOaQ8RJqoa/0MDJoGWyAGE8fp7cvabmZUzh1NpaqhqNy6xl1fjDhBv+R9LMhccbKbt7mQ== X-Received: by 2002:a05:6512:224d:b0:4b4:b5d3:6603 with SMTP id i13-20020a056512224d00b004b4b5d36603mr25635114lfu.32.1673035837373; Fri, 06 Jan 2023 12:10:37 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:36 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, Krzysztof Kozlowski Subject: [PATCH v2 08/11] dt-bindings: interconnect: qcom: drop IPA_CORE related defines Date: Fri, 6 Jan 2023 22:10:25 +0200 Message-Id: <20230106201028.1809541-9-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org These interconnects are modeled as clks, not interconnects, therefore remove corresponding defines from the binding as they're unused. Acked-by: Krzysztof Kozlowski Signed-off-by: Dmitry Baryshkov --- include/dt-bindings/interconnect/qcom,sc7180.h | 3 --- include/dt-bindings/interconnect/qcom,sc8180x.h | 3 --- include/dt-bindings/interconnect/qcom,sc8280xp.h | 4 ++-- include/dt-bindings/interconnect/qcom,sdx55.h | 2 -- include/dt-bindings/interconnect/qcom,sm8150.h | 3 --- include/dt-bindings/interconnect/qcom,sm8250.h | 3 --- 6 files changed, 2 insertions(+), 16 deletions(-) diff --git a/include/dt-bindings/interconnect/qcom,sc7180.h b/include/dt-bindings/interconnect/qcom,sc7180.h index f9970f6032eb..de5d5867bd67 100644 --- a/include/dt-bindings/interconnect/qcom,sc7180.h +++ b/include/dt-bindings/interconnect/qcom,sc7180.h @@ -108,9 +108,6 @@ #define SLAVE_LLCC 11 #define SLAVE_SERVICE_GEM_NOC 12 -#define MASTER_IPA_CORE 0 -#define SLAVE_IPA_CORE 1 - #define MASTER_LLCC 0 #define SLAVE_EBI1 1 diff --git a/include/dt-bindings/interconnect/qcom,sc8180x.h b/include/dt-bindings/interconnect/qcom,sc8180x.h index e84cfec5afdd..0bdc8d6cb401 100644 --- a/include/dt-bindings/interconnect/qcom,sc8180x.h +++ b/include/dt-bindings/interconnect/qcom,sc8180x.h @@ -129,9 +129,6 @@ #define SLAVE_SERVICE_GEM_NOC 16 #define SLAVE_SERVICE_GEM_NOC_1 17 -#define MASTER_IPA_CORE 0 -#define SLAVE_IPA_CORE 1 - #define MASTER_LLCC 0 #define SLAVE_EBI_CH0 1 diff --git a/include/dt-bindings/interconnect/qcom,sc8280xp.h b/include/dt-bindings/interconnect/qcom,sc8280xp.h index a3e5fda7c127..f89f47e99c6d 100644 --- a/include/dt-bindings/interconnect/qcom,sc8280xp.h +++ b/include/dt-bindings/interconnect/qcom,sc8280xp.h @@ -48,11 +48,11 @@ #define SLAVE_SERVICE_A2NOC 19 /* clk_virt */ -#define MASTER_IPA_CORE 0 +/* 0 was used by MASTER_IPA_CORE, now represented as RPMh clock */ #define MASTER_QUP_CORE_0 1 #define MASTER_QUP_CORE_1 2 #define MASTER_QUP_CORE_2 3 -#define SLAVE_IPA_CORE 4 +/* 4 was used by SLAVE_IPA_CORE, now represented as RPMh clock */ #define SLAVE_QUP_CORE_0 5 #define SLAVE_QUP_CORE_1 6 #define SLAVE_QUP_CORE_2 7 diff --git a/include/dt-bindings/interconnect/qcom,sdx55.h b/include/dt-bindings/interconnect/qcom,sdx55.h index bfb6524a2d90..1925f0784ab2 100644 --- a/include/dt-bindings/interconnect/qcom,sdx55.h +++ b/include/dt-bindings/interconnect/qcom,sdx55.h @@ -70,7 +70,5 @@ #define SLAVE_QDSS_STM 48 #define SLAVE_TCU 49 -#define MASTER_IPA_CORE 0 -#define SLAVE_IPA_CORE 1 #endif diff --git a/include/dt-bindings/interconnect/qcom,sm8150.h b/include/dt-bindings/interconnect/qcom,sm8150.h index a25684680c42..ef292791f52e 100644 --- a/include/dt-bindings/interconnect/qcom,sm8150.h +++ b/include/dt-bindings/interconnect/qcom,sm8150.h @@ -121,9 +121,6 @@ #define SLAVE_LLCC 15 #define SLAVE_SERVICE_GEM_NOC 16 -#define MASTER_IPA_CORE 0 -#define SLAVE_IPA_CORE 1 - #define MASTER_LLCC 0 #define SLAVE_EBI_CH0 1 diff --git a/include/dt-bindings/interconnect/qcom,sm8250.h b/include/dt-bindings/interconnect/qcom,sm8250.h index 1b4d9fbe888d..a4af5cc19271 100644 --- a/include/dt-bindings/interconnect/qcom,sm8250.h +++ b/include/dt-bindings/interconnect/qcom,sm8250.h @@ -115,9 +115,6 @@ #define SLAVE_SERVICE_GEM_NOC_2 15 #define SLAVE_SERVICE_GEM_NOC 16 -#define MASTER_IPA_CORE 0 -#define SLAVE_IPA_CORE 1 - #define MASTER_LLCC 0 #define SLAVE_EBI_CH0 1 From patchwork Fri Jan 6 20:10:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091765 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB2E8C71140 for ; Fri, 6 Jan 2023 20:11:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236421AbjAFULJ (ORCPT ); Fri, 6 Jan 2023 15:11:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236524AbjAFUKl (ORCPT ); Fri, 6 Jan 2023 15:10:41 -0500 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB0B68409F for ; Fri, 6 Jan 2023 12:10:39 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id bf43so3520635lfb.6 for ; Fri, 06 Jan 2023 12:10:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RmoHH6Hgcnax4siMasK0u+Npv8V2UvkY+nngddvtueY=; b=p57rjAp7lL4U0Yiv3/b2rQb72TkoTWnx/81x9BBdcG10iTsMkHd7j7ZC48O+IZnRh9 uuvp7LLq+nZvMlKwiv2Yt01ZanM48OUj7aL6ga1ooGzHDbrq2GvAq1diyDo0qXL/naQM SLywR1Z5n3RUATTQruSsinNtN2x1EQKlxedCyyIABful73gcSA0uUwdVzD07N5dMXjyv 9bMDpgoCiWLCd/KsuzYh2+4+LOoyYG598N0URsN0OtxUAGbNGMCWpIkixKQtWu+TYmN9 ONe3fDFewOwZtQ+brv3Imylx/A/bjGyBZRN/m9ua7g8NPUasYndgFxc4gJT/9pi/rD32 A8rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RmoHH6Hgcnax4siMasK0u+Npv8V2UvkY+nngddvtueY=; b=DzY5KOEaYLokLuo6KcE/xTM+7dC08BCJbsY0xahcSWQnut3gk0OHh/012Xyswt2wyz ZG9P5ZL9PPn5V/63Qf8r/gi9sK4/Up/IO3qEa6Stq9RDu5RbtnTKIXCxC6hCGMrBqhmU bV7zGI1Uds2gucL5/w2MExiPnIe/kKYI6yljT83McfKqL38VtFkWpDY+wCy0Qwnp9gVn QO/oo2pbos5uYO3betUrQBIMZGRvWwFOF5RuRDtHzxoV8gjGabku7XsgbAzLnmiQDuId 0QqZdDum2XslwgzrAzT/YXczpFEeLZbenf3p9XPK7YhDsS3Ns5hqFCVGg2cWCvGhapv1 V9lQ== X-Gm-Message-State: AFqh2kqLDpvlGgJL9J5XDQ5jhp/XuQRGXqCNXRPuDZ46Ce0Lih+wrP1C iFYTzpcZ11oVnXPF9lnzdlM5Lg== X-Google-Smtp-Source: AMrXdXvzNENdbm35qnG4EAUyzRBiu68z9wGV++yc9vltA2yHxWGn2FKCYPRdR1kXH1WkYUdKutrviA== X-Received: by 2002:ac2:5f6d:0:b0:4b5:830d:12b7 with SMTP id c13-20020ac25f6d000000b004b5830d12b7mr13082099lfc.41.1673035838237; Fri, 06 Jan 2023 12:10:38 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:37 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 09/11] clk: qcom: rpmh: define IPA clocks where required Date: Fri, 6 Jan 2023 22:10:26 +0200 Message-Id: <20230106201028.1809541-10-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Follow the example of sc7180 and sdx55 and implement IP0 resource as clocks rather than interconnects. Signed-off-by: Dmitry Baryshkov --- drivers/clk/qcom/clk-rpmh.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c index 586a810c682c..5f914cf36b10 100644 --- a/drivers/clk/qcom/clk-rpmh.c +++ b/drivers/clk/qcom/clk-rpmh.c @@ -445,6 +445,7 @@ static struct clk_hw *sm8150_rpmh_clocks[] = { [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw, [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw, [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw, + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, }; static const struct clk_rpmh_desc clk_rpmh_sm8150 = { @@ -484,6 +485,7 @@ static struct clk_hw *sc8180x_rpmh_clocks[] = { [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_d_ao.hw, [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_d.hw, [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_d_ao.hw, + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, }; static const struct clk_rpmh_desc clk_rpmh_sc8180x = { @@ -504,6 +506,7 @@ static struct clk_hw *sm8250_rpmh_clocks[] = { [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, [RPMH_RF_CLK3] = &clk_rpmh_rf_clk3_a.hw, [RPMH_RF_CLK3_A] = &clk_rpmh_rf_clk3_a_ao.hw, + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, }; static const struct clk_rpmh_desc clk_rpmh_sm8250 = { @@ -546,6 +549,7 @@ static struct clk_hw *sc8280xp_rpmh_clocks[] = { [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, [RPMH_PKA_CLK] = &clk_rpmh_pka.hw, [RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw, + [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, }; static const struct clk_rpmh_desc clk_rpmh_sc8280xp = { From patchwork Fri Jan 6 20:10:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091768 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3589C71159 for ; Fri, 6 Jan 2023 20:11:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236200AbjAFULN (ORCPT ); Fri, 6 Jan 2023 15:11:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236522AbjAFUKl (ORCPT ); Fri, 6 Jan 2023 15:10:41 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80C85840B0 for ; Fri, 6 Jan 2023 12:10:39 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id bq39so3580198lfb.0 for ; Fri, 06 Jan 2023 12:10:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yUZkGu7n26m3Xs47uNyxkgnrLNsx2oRREgP537Zptxo=; b=mQNAqqVI1eN5oosGZ8JxM06uTmD8U7axvC9oGHko6tIujVWTDigrThq3O1MHXDsH76 Ejdc+o3mI50lB6XJ/ceL1I87Z0bE4Y85+oSnvp/lnOH4p5USyUpqtZlFZSqvKpjtGZJm rlX8CTyVxcBPcA5wLhyVfDqqig4zf5H4cuWRBXDPRl/K7V+NzjXiqIRUrpp2oXsy0mPB XYi9Pplk8Mwr3rK16S+h2EnJyzhh33zm4FF4/dYqaA8DMwhD5q+B9rj/iFXXbFTgmUSJ 6KH3oml2dJmSE1tP8dyowPVRHxtM/L+kMmgOxFMZw6yQxb0d07kbxwRmxjmz654HrKrj mpoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yUZkGu7n26m3Xs47uNyxkgnrLNsx2oRREgP537Zptxo=; b=FuXpF1mbzC1L8yZ1cZ5jCEpf5IYfecVgRQJdjI8Z3xuqWA0uyqBtd7yTdPebdKunXV gBzGaxxeS53bellMerwLHcTaxmfI6AXKfzaBp6lyJeOzlH1YxxYaZh/MVAE0B4+IAoB1 nK72zb8Wi8Ocf0xhfef0FLbA/G7N331GXoSsLvjNlo5MotTRSZlsPa+C4Pj3CwvzzJzK l7WwVbN/3L9KYe3ZSC95SqxkMK/lFCA1/qMmqTw/7aHOxNaoXPLPTL91TC/49b0Fe9YV B0hfZ5fbEFPPIlo6yNo2ntB31weRJmRsj/U5oiRrBEpm4KG3pMn7e2m4oxCfszbc5A3F zaRA== X-Gm-Message-State: AFqh2kq0OFKDv+eiiYQcPXc/VRvcOalOw+nOZaZP1znJdT9Fv83hB3Ai qU11qodojTpOyqA9X3bKkRVvPg== X-Google-Smtp-Source: AMrXdXtyHDSKRUGaiu4yRuvlIgveUFroUUUW6X1t9wplFn1rJJBRItb8XucLpUHIT/g1lPzWL12psg== X-Received: by 2002:a05:6512:3901:b0:4a4:68b7:f892 with SMTP id a1-20020a056512390100b004a468b7f892mr19216831lfu.54.1673035839099; Fri, 06 Jan 2023 12:10:39 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:38 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 10/11] arm64: dts: qcom: sm8150: drop the virtual ipa-virt device Date: Fri, 6 Jan 2023 22:10:27 +0200 Message-Id: <20230106201028.1809541-11-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Drop the virtual ipa-virt device. The interconnects it provided are going to be represented as <&rpmhcc RPMH_IPA_CLK> clock. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 99750987c9d6..0759bc22d0c2 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -2057,13 +2057,6 @@ ufs_mem_phy_lanes: phy@1d87400 { }; }; - ipa_virt: interconnect@1e00000 { - compatible = "qcom,sm8150-ipa-virt"; - reg = <0 0x01e00000 0 0x1000>; - #interconnect-cells = <1>; - qcom,bcm-voters = <&apps_bcm_voter>; - }; - tcsr_mutex: hwlock@1f40000 { compatible = "qcom,tcsr-mutex"; reg = <0x0 0x01f40000 0x0 0x20000>; From patchwork Fri Jan 6 20:10:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13091762 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1D20C678DF for ; Fri, 6 Jan 2023 20:11:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236357AbjAFULF (ORCPT ); Fri, 6 Jan 2023 15:11:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236530AbjAFUKl (ORCPT ); Fri, 6 Jan 2023 15:10:41 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6314584094 for ; Fri, 6 Jan 2023 12:10:40 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id z26so3523680lfu.8 for ; Fri, 06 Jan 2023 12:10:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sjPB6qMW5CCrupsiViZnWcfIPvSm2Sn0b8lV/kmvycs=; b=fiycu6f9SM9Qtvt4lC3tNhv6teCDNmJVHyj58FWRNeK0Fp03pk1Vnqq5U7Y4x3nfLt KWXrya3wMr+nx9JFkKDDcfsemDxzoZ4A2vwrF9oRX7k6sAKd6Icnhqux9/nmfkbaD4BI PkNm4eME6SGquYHpDEVfWUzLNknfBpo8W97WE8ESIVQ+8mCfWnTDysR9Zueu+YEEpFcl f12MQAnMa96SCcdbTKrI3v3E2cRBCJfdL/lSpv86KJa6dBrd7OSuaTkor033iRydsUXp BeEqM9trnbEehpSsd2kGd+vvESTQtKEVQBFVQRYvdMkIshK9Z8YUIqSsAt7RkdzvE/s/ LTiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sjPB6qMW5CCrupsiViZnWcfIPvSm2Sn0b8lV/kmvycs=; b=G22Oi6FTNIaiCVDHyL45IRejdg/X0GaYKaXt1hp775p+IQbO0Vs4ep0hJRAumE1PEQ f+O4mI7W0O88Ykk9NPTQNoqBE3JbrRgUR3V64qwZEgsXNoa+iDMED7WFh0OAxadAntBy fK/uOSDz9V3AcuJwi9zrct/jQHG2dDor3D1217CJJrMPtzEHfw/PsCGas/BKkC1lr7N/ Dk7EWEWDAls5vVe2+gwu0BYwioCqMqEmpVpZmqZDRT6ENoeLDUHKDal2Y0GigHIaX97t An9Ah0wLLQOqYqstumHH3kaePHw/NtgkCmi3bq4IyD4IyPqo/NX1BBVr696sCg6TGo8q cQmA== X-Gm-Message-State: AFqh2kp7yj4L3UQ9n4p0MaxNgK8mv5AkSkbucKK0ImJU3c/3KtdEePVf 1o4bhNRcacmQ3fQQeJh+2MKvCQ== X-Google-Smtp-Source: AMrXdXt8wl68v8XvhFZ6lYEY21ShlaYEfGBja0VDtA8DeQOt+TRWmuY5YIn8qmWT0jSjvdWGvExG0w== X-Received: by 2002:ac2:5f43:0:b0:4cb:2c19:ec26 with SMTP id 3-20020ac25f43000000b004cb2c19ec26mr6719874lfz.35.1673035839977; Fri, 06 Jan 2023 12:10:39 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id f14-20020a0565123b0e00b004b7033da2d7sm260875lfv.128.2023.01.06.12.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 12:10:39 -0800 (PST) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Michael Turquette , Rob Herring , Krzysztof Kozlowski , Taniya Das Cc: Georgi Djakov , Alex Elder , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 11/11] arm64: dts: qcom: sm8250: drop the virtual ipa-virt device Date: Fri, 6 Jan 2023 22:10:28 +0200 Message-Id: <20230106201028.1809541-12-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> References: <20230106201028.1809541-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Drop the virtual ipa-virt device. The interconnects it provided are going to be represented as <&rpmhcc RPMH_IPA_CLK> clock. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index b3ab2896a6cc..af298dec0568 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2215,13 +2215,6 @@ ufs_mem_phy_lanes: phy@1d87400 { }; }; - ipa_virt: interconnect@1e00000 { - compatible = "qcom,sm8250-ipa-virt"; - reg = <0 0x01e00000 0 0x1000>; - #interconnect-cells = <1>; - qcom,bcm-voters = <&apps_bcm_voter>; - }; - tcsr_mutex: hwlock@1f40000 { compatible = "qcom,tcsr-mutex"; reg = <0x0 0x01f40000 0x0 0x40000>;