From patchwork Sat Jun 17 20:41:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 109552 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2169069vqr; Sat, 17 Jun 2023 14:17:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4jIU5Mzu9cOlrc4u80V57yxWwt4lGAgBUuW6KhIza/0r0B4KphbpkpktmvdSNoPNzrAHdC X-Received: by 2002:a17:90a:6e09:b0:259:c10:ea34 with SMTP id b9-20020a17090a6e0900b002590c10ea34mr4083427pjk.2.1687036644133; Sat, 17 Jun 2023 14:17:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687036644; cv=none; d=google.com; s=arc-20160816; b=xLPE5xPIc4GD7jvvM4ZtIW8Bn1aORDs+o0CgypJmFFIqybHpleqmJY2xU7uIft5a2s dO4YXRKti3LDBqS/3lvkpOJJJv+B2CoOj0I1uvVjwvwBfASR8I1GZBR01D19TjznpJpI xehzM7oYe1BTGhXHzbLt0H0slReDvMaqPGFZOBnpF2RsGlUaTrpMbTQpZ+UnlT52TDYr //ryz63r4wiauSHWRNgHdHqC/m90ehLOU8cM+UsbPYNfqdkv/cEVQ4tdNBXb1SYwxbYC Fj9HcUXtcD/ExDJTtizOIYJ65P0n1HFcJ+aZn/Ylfu/PxDJTzXvIad2q6l26G1o3v+Dg wmjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=l4vgBQIdezab+uv8qKX62YxsEkskvdgwPbAcwg7/AX8=; b=aklqqQNVLzcHy4s5GOye2nYzkNYuxqA5yx4/VYTYKB2hb0lxEgR+2IsLlZ2XkNJD8g /XgUvnzoSJASiTrLDU64sWPJ48edtIyyr5pjuBIV2y8CRLOBZmG6Bt+s+JwPuy5b/LGI iZGzv+2AhSs3TJqf+1o4TPOkOiOKU56DYWsrr6e8uV+jGYVD8iDgKMcb9cifrYsowfPR qSYY+Mbyn3gyQ6hd44gONTXAExp+ri5YCR+FSlchx8twJ8Cy7iFhgKDaNrLOpRdtDGjt aaIq4OZz8yH4DW2e0ISn2xP9XQBScfRNvr1lvmSgTMQRFidB/bZbT3xhZwHzT6irhij9 sFHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jh0IDKMz; 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=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d5-20020a17090a7bc500b00256551043fdsi4388393pjl.72.2023.06.17.14.17.12; Sat, 17 Jun 2023 14:17:24 -0700 (PDT) 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=@linaro.org header.s=google header.b=jh0IDKMz; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346549AbjFQUlh (ORCPT + 99 others); Sat, 17 Jun 2023 16:41:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346469AbjFQUl0 (ORCPT ); Sat, 17 Jun 2023 16:41:26 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CAA71700 for ; Sat, 17 Jun 2023 13:41:25 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-986d871a9beso223270766b.1 for ; Sat, 17 Jun 2023 13:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687034484; x=1689626484; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=l4vgBQIdezab+uv8qKX62YxsEkskvdgwPbAcwg7/AX8=; b=jh0IDKMzx58PthW4kACF8YpXD+TGBvd3q0tJhF5gO3RvOSgXE7HkDQyyk7ZkRKukff DhJKdlQa8CZQRSpxBeZzAOnjNopKoQkzGd4w/PNe6j/v5/I5jknDYrfS7ejMWEAAcYF9 lMRsquqzDarHg3IMS3wcoJZnulOz8z/7Cwt46TNAZyWMYeFZ62E0WYaVpaYWCi6jUdDj JF2/9cT/6bCq4StxUlmrHJPZNMmhbTd97eguN8mdTixTUDT99lP+VYFZW8tt3FX+XnZ9 GjieT2r+lJPDTEDnfIbXGSKVdqXZoGTSZoe4Yhu4K6FvU2S5ZkBkBsISAGwN0ukywSjF qquQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687034484; x=1689626484; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=l4vgBQIdezab+uv8qKX62YxsEkskvdgwPbAcwg7/AX8=; b=aThO/cwi6lIgwfL5G8PwJttHCkXv5CyGrZkhTSEgBYvLOFS/nMUasL/ccPMeSN4hfT 263OsJRDQG6bYH99rOBwoTkK6ryWbQA75Yz/an/WJFJesLciTyL6MfvHTs1E+CoXg2VC o1A3MEAxswRMnL8Q+rhF3AYF2v4w2HgIBonoQMabaEXB6xmeWJVpP/CFcwkHI+s9HwRc unBlNmOXHb9mAxeyeBFZz4MNYEnFws2NSXlekJk6cMBNnibBLecTOW+yOMSH6VH8USct V9TAklei0sr8JotOo0GkFg243SuHkg3R16sQj9c/C1UCPmzhBqSfDllCQBvvRv17Ecxs zLTA== X-Gm-Message-State: AC+VfDyjvsnPrUdb6h98L8UvD3eexT7GTUJdkxEuqb5WSVmF7YDsKArG zsnw2OjbP3Fb6of29jXaTEXmMg== X-Received: by 2002:a17:906:4fd1:b0:973:ff8d:2a46 with SMTP id i17-20020a1709064fd100b00973ff8d2a46mr5776689ejw.3.1687034483837; Sat, 17 Jun 2023 13:41:23 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.26]) by smtp.gmail.com with ESMTPSA id qn18-20020a170907211200b00982c33ea394sm3349203ejb.97.2023.06.17.13.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jun 2023 13:41:23 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Abel Vesa , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/3] arm64: dts: qcom: sm8150: Fix OSM L3 interconnect cells Date: Sat, 17 Jun 2023 22:41:16 +0200 Message-Id: <20230617204118.61959-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1768986136290716519?= X-GMAIL-MSGID: =?utf-8?q?1768986136290716519?= Qualcomm Operating State Manager (OSM) L3 Interconnect does not take path (third) argument. This was introduced by commit 97c289026c62 ("arm64: dts: qcom: sm8150: Use 2 interconnect cells") which probably wanted to use 2 cells only for RPMh interconnects. sm8150-microsoft-surface-duo.dtb: interconnect@18321000: #interconnect-cells:0:0: 1 was expected Fixes: 97c289026c62 ("arm64: dts: qcom: sm8150: Use 2 interconnect cells") Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 18c822abdb88..b46e55bb8bde 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -56,7 +56,7 @@ CPU0: cpu@0 { qcom,freq-domain = <&cpufreq_hw 0>; operating-points-v2 = <&cpu0_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>; + <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; power-domains = <&CPU_PD0>; power-domain-names = "psci"; #cooling-cells = <2>; @@ -85,7 +85,7 @@ CPU1: cpu@100 { qcom,freq-domain = <&cpufreq_hw 0>; operating-points-v2 = <&cpu0_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>; + <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; power-domains = <&CPU_PD1>; power-domain-names = "psci"; #cooling-cells = <2>; @@ -109,7 +109,7 @@ CPU2: cpu@200 { qcom,freq-domain = <&cpufreq_hw 0>; operating-points-v2 = <&cpu0_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>; + <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; power-domains = <&CPU_PD2>; power-domain-names = "psci"; #cooling-cells = <2>; @@ -133,7 +133,7 @@ CPU3: cpu@300 { qcom,freq-domain = <&cpufreq_hw 0>; operating-points-v2 = <&cpu0_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>; + <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; power-domains = <&CPU_PD3>; power-domain-names = "psci"; #cooling-cells = <2>; @@ -157,7 +157,7 @@ CPU4: cpu@400 { qcom,freq-domain = <&cpufreq_hw 1>; operating-points-v2 = <&cpu4_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>; + <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; power-domains = <&CPU_PD4>; power-domain-names = "psci"; #cooling-cells = <2>; @@ -181,7 +181,7 @@ CPU5: cpu@500 { qcom,freq-domain = <&cpufreq_hw 1>; operating-points-v2 = <&cpu4_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>; + <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; power-domains = <&CPU_PD5>; power-domain-names = "psci"; #cooling-cells = <2>; @@ -205,7 +205,7 @@ CPU6: cpu@600 { qcom,freq-domain = <&cpufreq_hw 1>; operating-points-v2 = <&cpu4_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>; + <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; power-domains = <&CPU_PD6>; power-domain-names = "psci"; #cooling-cells = <2>; @@ -229,7 +229,7 @@ CPU7: cpu@700 { qcom,freq-domain = <&cpufreq_hw 2>; operating-points-v2 = <&cpu7_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>; + <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; power-domains = <&CPU_PD7>; power-domain-names = "psci"; #cooling-cells = <2>; @@ -4342,7 +4342,7 @@ osm_l3: interconnect@18321000 { clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GPLL0>; clock-names = "xo", "alternate"; - #interconnect-cells = <2>; + #interconnect-cells = <1>; }; cpufreq_hw: cpufreq@18323000 { From patchwork Sat Jun 17 20:41:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 109554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2182520vqr; Sat, 17 Jun 2023 15:03:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4sksZOq/YFhCZEhnSsfCC2082s4Mx21C/zNAAozmF6wDuU204l0oypRSrQdD5eQjvJVYCU X-Received: by 2002:a05:6808:1a96:b0:398:1197:bbfb with SMTP id bm22-20020a0568081a9600b003981197bbfbmr5261112oib.55.1687039439297; Sat, 17 Jun 2023 15:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687039439; cv=none; d=google.com; s=arc-20160816; b=HUep/7Ej9B04QgFcJlKcKEEgFBBEVvmf3wCdNDbVivxIeinikjq0wO+xchOPBj1iYC UQGgTkyaS/Qfu08tVYnEU55lLxsJEZNXxGijvTxK0sBX3wMJNrsrbuRhwvNIsgWRmh79 b9MGMofXq+QYbYhZ4EWMqPwaepz+6QOTEkDewVbmWUsBlpxhH41FMh/0OYU7FL13DZ7f FZVPQhHm8HTF8/e6GQO7u/Ziq1vZe3NiZF4b3V5ivjyk9GXT4C8iXxwIFm5LYQBFn4o8 +tqSAReENgiyxBd7GKJPUo5yhVlwO+Q4i0o29872WYQedj+ZyXuRzmrH6I7wcmUTV/xm /54A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4ul5u2LRy09FnZ57VCih9X+lrbtOZWLMB4/wwnDvm74=; b=HJBhazUKwhcBa/USOhfRksOuLKtsbcMsa8OF7i95r596DPe2RoVDYos1reNmO9tk4K WdDtNnDL37oVRmR/wLnkRMqQ0RNeGlCBS+vVVlws/pV+esMmKaz36PDfAsU6n4wIajPH GkKZlmTRpqXmwgZ0Mnx91YxmDF4KhdHZCfHbuL9OQthFOYVF9D9nvPAOye3GQeLsdJ4n +X+Q7nlAtJuBjexBPpgT7wAWym4o5S+EwF6+if6TuekW+2lpEd7tkDI5qYcTd+rS9rLG rhUc+TNHhRFnc5b2NEEAFXDTvQJnC+zgVk4h76r0F74/xXXye+xBTIr/wpNMIVHkdkhQ SjfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KPyTRKkk; 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=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r12-20020a17090aad0c00b0025c26968058si4541282pjq.5.2023.06.17.15.03.44; Sat, 17 Jun 2023 15:03:59 -0700 (PDT) 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=@linaro.org header.s=google header.b=KPyTRKkk; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346536AbjFQUlj (ORCPT + 99 others); Sat, 17 Jun 2023 16:41:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346533AbjFQUl2 (ORCPT ); Sat, 17 Jun 2023 16:41:28 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE9C719BE for ; Sat, 17 Jun 2023 13:41:26 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-51a426e4f4bso1942929a12.1 for ; Sat, 17 Jun 2023 13:41:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687034485; x=1689626485; 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=4ul5u2LRy09FnZ57VCih9X+lrbtOZWLMB4/wwnDvm74=; b=KPyTRKkk7Sl3y7iSnj0nTVpXG8juNgHaXnt4p94mLn8MSFQD9+/gjievTziaCNsM7p bhLHWz3eJYD9Xh44GjUkIeDTZujPW93RPjVYdTW1knU6H8lRpktBSpZ4hmmdlDtgHtyw hjMS3p6YWI5Z6kqTmA+YKwAbAKwSKJIxEVhJT4raGS68oHHvAXYqXHr2nLiVxApxSPNx hzro+o5cLG2Haj8o6IHQk5ywSWiXKtuc+QET8JUeh+CiArzdEy4jtR4T4A9yUx5fs7wr SJ0eJxJE16Y5qLcMFQE7U8iA0Ck/wapcZLqsEm42VZlGX8dl5V1NZbQVODqqtDjCqFWk brnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687034485; x=1689626485; 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=4ul5u2LRy09FnZ57VCih9X+lrbtOZWLMB4/wwnDvm74=; b=Rrb+iwK2kcWm5/VRc/q4Oi9CFdpjgI0HbMM2h58wAO+WmWShevm/KPEsdCq7lCZwar R4gpZiRiePoA5oZlchU2HIW8DwPZwzZ0WFHsVn2P7Kz2BhIDXZccV7uiu02s+ZV3YbI0 t+nB314Y781z/8wM+dIweh6uzeiTZxDzZMZ1Ptj7fVIeFITrw5PpbU0myMI9NG+JVBCn sVXRRL7mukoOrFBjeONi3KJ7KKjFD47SXvCG7yDWxQ1GYB2n9ukTtZYA0UPq5eEv90Qx OXqzFTcM7gvOUNZRfr7U0WdO0pqAUJ7uv4nj2m0vk3RIXg9YMYg/PsXvVfu3VoP0Z+J1 6B8A== X-Gm-Message-State: AC+VfDzEwIqZuSATSb3O9cqFWpYrlKOHTwBCXPBDdpN1hGXsF0BVtKR7 Zq2gnM/QeOH55aMxZa0UI1Mo9g== X-Received: by 2002:a17:907:60cc:b0:94a:845c:3528 with SMTP id hv12-20020a17090760cc00b0094a845c3528mr5551178ejc.45.1687034485459; Sat, 17 Jun 2023 13:41:25 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.26]) by smtp.gmail.com with ESMTPSA id qn18-20020a170907211200b00982c33ea394sm3349203ejb.97.2023.06.17.13.41.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jun 2023 13:41:25 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Abel Vesa , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/3] arm64: dts: qcom: sm8250: Fix EPSS L3 interconnect cells Date: Sat, 17 Jun 2023 22:41:17 +0200 Message-Id: <20230617204118.61959-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230617204118.61959-1-krzysztof.kozlowski@linaro.org> References: <20230617204118.61959-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1768989066877086564?= X-GMAIL-MSGID: =?utf-8?q?1768989066877086564?= Qualcomm EPSS L3 Interconnect does not take path (third) argument. This was introduced by commit b5a12438325b ("arm64: dts: qcom: sm8250: Use 2 interconnect cells") which probably wanted to use 2 cells only for RPMh interconnects. sm8250-hdk.dtb: interconnect@18590000: #interconnect-cells:0:0: 1 was expected Fixes: b5a12438325b ("arm64: dts: qcom: sm8250: Use 2 interconnect cells") Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 83ab6de459bc..1efa07f2caff 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -107,7 +107,7 @@ CPU0: cpu@0 { qcom,freq-domain = <&cpufreq_hw 0>; operating-points-v2 = <&cpu0_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>; + <&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>; #cooling-cells = <2>; L2_0: l2-cache { compatible = "cache"; @@ -138,7 +138,7 @@ CPU1: cpu@100 { qcom,freq-domain = <&cpufreq_hw 0>; operating-points-v2 = <&cpu0_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>; + <&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>; #cooling-cells = <2>; L2_100: l2-cache { compatible = "cache"; @@ -163,7 +163,7 @@ CPU2: cpu@200 { qcom,freq-domain = <&cpufreq_hw 0>; operating-points-v2 = <&cpu0_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>; + <&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>; #cooling-cells = <2>; L2_200: l2-cache { compatible = "cache"; @@ -188,7 +188,7 @@ CPU3: cpu@300 { qcom,freq-domain = <&cpufreq_hw 0>; operating-points-v2 = <&cpu0_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>; + <&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>; #cooling-cells = <2>; L2_300: l2-cache { compatible = "cache"; @@ -213,7 +213,7 @@ CPU4: cpu@400 { qcom,freq-domain = <&cpufreq_hw 1>; operating-points-v2 = <&cpu4_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>; + <&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>; #cooling-cells = <2>; L2_400: l2-cache { compatible = "cache"; @@ -238,7 +238,7 @@ CPU5: cpu@500 { qcom,freq-domain = <&cpufreq_hw 1>; operating-points-v2 = <&cpu4_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>; + <&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>; #cooling-cells = <2>; L2_500: l2-cache { compatible = "cache"; @@ -263,7 +263,7 @@ CPU6: cpu@600 { qcom,freq-domain = <&cpufreq_hw 1>; operating-points-v2 = <&cpu4_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>; + <&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>; #cooling-cells = <2>; L2_600: l2-cache { compatible = "cache"; @@ -288,7 +288,7 @@ CPU7: cpu@700 { qcom,freq-domain = <&cpufreq_hw 2>; operating-points-v2 = <&cpu7_opp_table>; interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>, - <&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>; + <&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>; #cooling-cells = <2>; L2_700: l2-cache { compatible = "cache"; @@ -5679,7 +5679,7 @@ epss_l3: interconnect@18590000 { clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GPLL0>; clock-names = "xo", "alternate"; - #interconnect-cells = <2>; + #interconnect-cells = <1>; }; cpufreq_hw: cpufreq@18591000 { From patchwork Sat Jun 17 20:41:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 109551 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2169059vqr; Sat, 17 Jun 2023 14:17:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6/vEaq5nDZXIK+p1M8PA3z0OJD7QuP8fsGeYNg5NNgFg5eaqLKKuLrnRl64WToWbsEXgI9 X-Received: by 2002:a05:6a00:2d8c:b0:666:eb2b:961c with SMTP id fb12-20020a056a002d8c00b00666eb2b961cmr5627057pfb.28.1687036641935; Sat, 17 Jun 2023 14:17:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687036641; cv=none; d=google.com; s=arc-20160816; b=JB6p0jduVJoDy75n3od2/yvE5s8rPDzh0nOpyz20a6cSlm/6C8smbj/7HvBPX3qIql zJMsW2XlmMqDeYmWTYLAqGq0eogrGwzH9OmczyIgL9kUMjG5zvMVr6syFICWgEAa1VrS NuAqHe1pQ9LMEPcFP0S85t7p/F07gQOqPi6uGBLNfONyc+g9TKzk7/cbt8uZvYqlDMWh 9KyvO2DWLhF+7r+VAuyBgSTDaVbvYuqWbr56/ub1CkmhST2rqYEW4ZKzr4h5veSYyWQp 7W7Gm2Fj+z40zOH6tVPC0nfMZqJKbz5IhWK8RrV2Jcu13DNT5lV2iCaowyBNSGSBq8NQ 5gPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0YMohJWhk2sPmAd88p9LdyGWgkzdVwbfUdAqnb6H2VE=; b=Xgk0g2930O1cxKFq4FmaaF4QkXubXtNEXAawdX7pLU/h0Q9a3ASC5WSdYllkZfa6L1 9fmOf8i02sBEDdWpPsL41ww1AO1LvTOhAEZfIU4WIQrWfEooR6CTGE3zfaFM7wTsgyHf OgPOPz54mGTHOtJ8Nh+g2+a8v2ElT2y3fd5KSdTNiyzQKlMwQIAXUkA6+/iCu6BaSrM/ RdFOV/Z8Pv6nS3Vpx2bFv2mF7MHogF21nRK0PWpDo51b8FG/J6BB8OcXD6jJ3jTosuj2 bPXwl0hu4j5nDxDPUcMyAUXPA0iDU9FxDXnCjq/KlDOPGWpBJH8kz1LKJrK2Hogu7xMb geVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cE1eusYA; 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=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z7-20020a626507000000b006664122cc6csi8134708pfb.404.2023.06.17.14.17.09; Sat, 17 Jun 2023 14:17:21 -0700 (PDT) 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=@linaro.org header.s=google header.b=cE1eusYA; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346561AbjFQUlp (ORCPT + 99 others); Sat, 17 Jun 2023 16:41:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346540AbjFQUla (ORCPT ); Sat, 17 Jun 2023 16:41:30 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B89EB1FF7 for ; Sat, 17 Jun 2023 13:41:28 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-51a3e6a952aso2436020a12.3 for ; Sat, 17 Jun 2023 13:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687034487; x=1689626487; 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=0YMohJWhk2sPmAd88p9LdyGWgkzdVwbfUdAqnb6H2VE=; b=cE1eusYADr7vRUpNFcqt0nQuoXX4oWfGd8Mbi+v7wYMZydVDiAVSOllaxD/EnkcYly rM6fZTSUFMkGTdd2Gjs5j2xCEGAaMQZKEKHbmE956KQe0LzqASww9muAuGOQboHHdzwX upa2ix7x5+JrK6ZTvF7gGp407OXD3WHtZrBJt8mpZ8faBjtNXNeDokrv08Btj+nfmiIe 5glojJXxSIQueE0sQcj0XRrton/LeOSKB0+Ro7fqkbkakn8DxAsw9O50ezuZZ4MkOl/8 EDZ92eT7YNyIiuliujhRInhYEgJ7GWM4+3n+5z6LhBqiyUtOVETtwY/25r3KVf8NaBmS btvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687034487; x=1689626487; 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=0YMohJWhk2sPmAd88p9LdyGWgkzdVwbfUdAqnb6H2VE=; b=h3E7AXRH59vMyS2hrA2Zw8SvjkpJC9yRA5zUPuLNFYHDcxxrTMZYY12OtpRMmy1TIk xCXwjN3AYFWcs9m0NSi0/FBvcQ6pOhweQmzIN2la7zaew0fUssMsva9MD2+9pnxrrnL8 9rKgMNEOwES/6sONNZCWtMQfaVGPFF+OBP6iTTyIdEfCRqZDdG9Tw/UFJqdMsvGpqpAP Oar8A9mz7eFw8+/r70pQ/oU5Fwm+DUlPvGqiX3nNdFsyW+xD0Re09ngM25A/v2pKiZX8 PpH8Hwr7XsJQtOaX1TjH1vx4L+BBFariB3FCf/qX3eO5BUVVIP2c9VUn+pNuEYpZB7fX osxA== X-Gm-Message-State: AC+VfDwCiKEWRPCA+yitk2GEVCRWK/LfQ/mBM5JzexA9VhLNfmU9LQw0 yMDQshwC6An2gRsMTlIcubjKPjBoGjmIdSnYYXQ= X-Received: by 2002:a17:907:86ac:b0:96f:88a3:3a0e with SMTP id qa44-20020a17090786ac00b0096f88a33a0emr6422515ejc.0.1687034487174; Sat, 17 Jun 2023 13:41:27 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.26]) by smtp.gmail.com with ESMTPSA id qn18-20020a170907211200b00982c33ea394sm3349203ejb.97.2023.06.17.13.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jun 2023 13:41:26 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Abel Vesa , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/3] arm64: dts: qcom: sc8180x: Fix OSM L3 compatible Date: Sat, 17 Jun 2023 22:41:18 +0200 Message-Id: <20230617204118.61959-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230617204118.61959-1-krzysztof.kozlowski@linaro.org> References: <20230617204118.61959-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1768986133830870011?= X-GMAIL-MSGID: =?utf-8?q?1768986133830870011?= Since commit c70edc067739 ("dt-bindings: interconnect: Add sm8350, sc8280xp and generic OSM L3 compatibles") OSM L3 compatible should have generic fallback: sc8180x-primus.dtb: interconnect@18321000: compatible: 'oneOf' conditional failed, one must be fixed: Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi index b02e14c96874..204deefbfa8b 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi @@ -3564,7 +3564,7 @@ rpmhpd_opp_turbo_l1: opp10 { }; osm_l3: interconnect@18321000 { - compatible = "qcom,sc8180x-osm-l3"; + compatible = "qcom,sc8180x-osm-l3", "qcom,osm-l3"; reg = <0 0x18321000 0 0x1400>; clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GPLL0>;