From patchwork Mon Mar 20 14:46:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 72207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1262288wrt; Mon, 20 Mar 2023 07:58:41 -0700 (PDT) X-Google-Smtp-Source: AK7set99PkyQOTnF9RWHJCEaSWps/a2TSBWOMu9GYFkp/pCqCcvQMHYYJiUOmKkrJTQWAfxu2SK4 X-Received: by 2002:a17:90b:4a49:b0:23d:4241:af0 with SMTP id lb9-20020a17090b4a4900b0023d42410af0mr20930133pjb.3.1679324321429; Mon, 20 Mar 2023 07:58:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679324321; cv=none; d=google.com; s=arc-20160816; b=FWpDAp6aJCGpMDSrzIqs+MXONYmIeHrEmFvacJCmMXhELXtXujuVy8PRYOAAORGv0T 4JhNnlo3GIyVGqczGJDiuk7U+DimkaXaseTv0row+RVxOV5Lu9RYjmx+E8lUJsi5ndy1 ntrT7yU0OK48JXztLmHkr4ryKBGPxt0RnTUsjmfNVLxUlSENL5BidXySMy7860McMs1C i2g9R+nJtJCq9X+IXEmXDPtZvEPt9rQs30ZIiXyh0z8lj954HJ1XnEdkpzIb7yzvMPmM vdHa83X9u0Iw4xTL8QbJc0abRqw6d+eizy/u5mZAwJ38I/7oj4w4FjNc1pVl0W03OtZD Lvlg== 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=Il9YWorlQE7qriqKsC4ZO4n1FQhxWC5upPu4Ay50MJY=; b=RGo2EpeIrW4OzxiYmY0d7J5VJIdp+OPxJDrZWpz5oiK3Yss1RMQQZP3QsyqiaVwBZX N5oKWK1EdCGWyj/r8qayA+nU5xu30eVO/XxQyjkYc41UzRqoHSUbs/Wx3T1dcOVu892d Gm19wCem7cCHKcOFbHpvo0pkvMkWzffCUYTfj4rlqLKIMhLaKkWXyVV2ftE8E0nBReY3 yHssPEOH2FygauxVATvtIdqKJFdxV0rBz2h/1RX7DGaIDxsVUI46odyd6TWqp4/Q/iZs MzCl/6+a34I4N7LyBlFUD54sqqmKzB9NwYQ0iW4RIORSi795n2jho3coSjGX8pzZACM2 jRDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FBcCe0Xs; 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 x8-20020a634a08000000b004fbbbc81456si10334407pga.293.2023.03.20.07.58.26; Mon, 20 Mar 2023 07:58:41 -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=FBcCe0Xs; 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 S232168AbjCTOuI (ORCPT + 99 others); Mon, 20 Mar 2023 10:50:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231992AbjCTOt3 (ORCPT ); Mon, 20 Mar 2023 10:49:29 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F19032595F for ; Mon, 20 Mar 2023 07:47:49 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id x3so47681488edb.10 for ; Mon, 20 Mar 2023 07:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679323640; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Il9YWorlQE7qriqKsC4ZO4n1FQhxWC5upPu4Ay50MJY=; b=FBcCe0Xs0m4wCKZL7wJQPbxIonSqZsX0kg3cURIN3/IszssXDbcQRURBwuYQCwhXra wgFt+NPOwYG4vJfPKs86Ju9T/efHjo29D3lLGApKgLJ1zpH4Fy1zlZiBLDuWDCvpkTGU Ea/nA+kpZPyZOk4+XlZDVG/bxVFZY/aK/bPcNGefdx1qVMAxq8vmjj9nNjnv9MyoUF2h f322ouEa1vEVtuumatLFlxHEVoyPifT9g1g9L2WvT/Mr7wgwna9JYW2PTeZZXHAtA/4A IUAK6Occ1xz5GFmiCcBWzehOcHgr2qpte2UAay2/51BLIuLpFWleLow3Z4tkYuX30lFJ 1FcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679323640; 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=Il9YWorlQE7qriqKsC4ZO4n1FQhxWC5upPu4Ay50MJY=; b=kDwJ0zdPRdk5v5qXdvoBWNu7NXFQxQ698M+Ln1R1Xg4X5G1XpEjIFHGDqjh4xSM6qO FXjQjJGLn8wIGxVejF7fD0Rk5RS1QRKbwbOLNGf+2kn8/WZDsi30fYt0jbn3Y8tzw3A9 Q1MN9lIlCD3daYX7bTkqwQ2UBrXXC/3AP9iX0Mq5xNtdz1vmdZak5xu89gnnrWUN+Ewn YJqifG56ZwhJo0pBdw1GExMxLst7JGCzSRBKg6VnppjoONS338f6QrHOkS6xXr7z4ghm ZPEqQnAoOgr/CMQ8INRf27XUJzkefJsmszLJRSINcBiduSbx6BswyTvpLE4rRVqunX3d AnBg== X-Gm-Message-State: AO0yUKUsPhsIi0C5wzrm1U56viv7DLC9iUeZhAoH9FXiWdM4opSA1iBi Ide3zmw2ROZGaKmwl0lcHNA2wA== X-Received: by 2002:a17:906:39ce:b0:932:c1e2:9983 with SMTP id i14-20020a17090639ce00b00932c1e29983mr10328923eje.15.1679323640207; Mon, 20 Mar 2023 07:47:20 -0700 (PDT) Received: from localhost.localdomain ([94.52.112.99]) by smtp.gmail.com with ESMTPSA id x2-20020a50ba82000000b004fb30fc1dabsm4913172ede.96.2023.03.20.07.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 07:47:19 -0700 (PDT) From: Abel Vesa To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Bjorn Helgaas , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , Philipp Zabel , Linux Kernel Mailing List Cc: linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, Krzysztof Kozlowski , Johan Hovold Subject: [RESEND PATCH v9 1/2] dt-bindings: PCI: qcom: Add SM8550 compatible Date: Mon, 20 Mar 2023 16:46:57 +0200 Message-Id: <20230320144658.1794991-1-abel.vesa@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 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?1760899179831017099?= X-GMAIL-MSGID: =?utf-8?q?1760899179831017099?= Add the SM8550 platform to the binding. Signed-off-by: Abel Vesa Reviewed-by: Krzysztof Kozlowski Reviewed-by: Johan Hovold --- This patch is a resend of the following: https://lore.kernel.org/all/20230208180020.2761766-10-abel.vesa@linaro.org/ No changes since then. .../devicetree/bindings/pci/qcom,pcie.yaml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml index fb32c43dd12d..be7b4b805291 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml @@ -38,6 +38,7 @@ properties: - qcom,pcie-sm8350 - qcom,pcie-sm8450-pcie0 - qcom,pcie-sm8450-pcie1 + - qcom,pcie-sm8550 - items: - const: qcom,pcie-msm8998 - const: qcom,pcie-msm8996 @@ -58,6 +59,12 @@ properties: minItems: 1 maxItems: 8 + iommus: + maxItems: 1 + + iommu-map: + maxItems: 2 + # Common definitions for clocks, clock-names and reset. # Platform constraints are described later. clocks: @@ -205,6 +212,7 @@ allOf: - qcom,pcie-sm8350 - qcom,pcie-sm8450-pcie0 - qcom,pcie-sm8450-pcie1 + - qcom,pcie-sm8550 then: properties: reg: @@ -639,6 +647,37 @@ allOf: items: - const: pci # PCIe core reset + - if: + properties: + compatible: + contains: + enum: + - qcom,pcie-sm8550 + then: + properties: + clocks: + minItems: 7 + maxItems: 8 + clock-names: + minItems: 7 + items: + - const: aux # Auxiliary clock + - const: cfg # Configuration clock + - const: bus_master # Master AXI clock + - const: bus_slave # Slave AXI clock + - const: slave_q2a # Slave Q2A clock + - const: ddrss_sf_tbu # PCIe SF TBU clock + - const: noc_aggr # Aggre NoC PCIe AXI clock + - const: cnoc_sf_axi # Config NoC PCIe1 AXI clock + resets: + minItems: 1 + maxItems: 2 + reset-names: + minItems: 1 + items: + - const: pci # PCIe core reset + - const: link_down # PCIe link down reset + - if: properties: compatible: @@ -724,6 +763,7 @@ allOf: - qcom,pcie-sm8350 - qcom,pcie-sm8450-pcie0 - qcom,pcie-sm8450-pcie1 + - qcom,pcie-sm8550 then: oneOf: - properties: From patchwork Mon Mar 20 14:46:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 72210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1263318wrt; Mon, 20 Mar 2023 08:00:37 -0700 (PDT) X-Google-Smtp-Source: AK7set9yeD4QbVGypaXZJAc6/QaZW4CprRoE8AlOHVkdAe2AuieW+/HbruHsuCb9SCntSdFjelbp X-Received: by 2002:a17:902:f1cc:b0:19f:3234:fec5 with SMTP id e12-20020a170902f1cc00b0019f3234fec5mr13774874plc.51.1679324437175; Mon, 20 Mar 2023 08:00:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679324437; cv=none; d=google.com; s=arc-20160816; b=IUvKmo2tbmnKRXvR/ViW8Hg+HaM7k3toGeDkjUrtUjtOsljs5e5rssmmWY3J7SV6OO s4cRQzb6ertkc34LGwm0ePZgbixcm0IzX21iNwxIJYsvMFkhX+mAeBhIil9Ia4YGmL54 /+gGHwt8jzQn6ftop+T6ifLWkJDMtADeK8IH6C030x57b8oL98TF2tm7+xJyC2UnvxiP OydxgfJLPw3k6fbyFj3UEPSAR1wpcmEfMd68lLEwa9DYbgqSqDf9Jw/ZPooRh7+/YdzO o+jRaQ46okPNQeVisYHmc7+ct6iuSWn1YWl3lt7dJl/Y12qPPiW8w/bAAHm6ZUXF8gdO 6O1w== 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=QD7ylI6TVHUGdBJgMovYJYcYKC/vfqGxmwJNLbiL6ds=; b=h+FdNbgJ0MporWz/Ac8BU4TMedMZGHFf2uAse1XSo8wX+EoSM1AdwknZJKHofYSmoJ 8l3iEWpzeU9XLkK4FWiH6aWKOgj6fhzAwaPOTy0Edzq2+oGiGXYDb6ES9C9cmnQkdEZP ptDvmIDS8gOupj/nXNqQAzoMrwXKRfGMuY1NFFA10PzLGg+eu05YVFLOL21qaho02/wY sYhRmrpBmGM0dnnhw5qftI3Npm4AV3LUM9SKlO1nty85hpZcGzbAID8NL6Pj3GftwG0O SXhccqx8VsmLOB0A4Qi/LSgcdAVqY/nwU/V4vjuKzGR3JWDaqLbUPFCivaXg10FOluzg qkDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PkVWnB6X; 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 c1-20020a170903234100b0019f24ac1ab4si11140256plh.472.2023.03.20.08.00.21; Mon, 20 Mar 2023 08:00:37 -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=PkVWnB6X; 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 S231896AbjCTOuN (ORCPT + 99 others); Mon, 20 Mar 2023 10:50:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232013AbjCTOth (ORCPT ); Mon, 20 Mar 2023 10:49:37 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B485628E89 for ; Mon, 20 Mar 2023 07:47:52 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id o12so47716502edb.9 for ; Mon, 20 Mar 2023 07:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679323641; 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=QD7ylI6TVHUGdBJgMovYJYcYKC/vfqGxmwJNLbiL6ds=; b=PkVWnB6X3c63HHvavZdeVbDn3Tx36qitT0fT6ic0Its1qN+eoMlxng6rqKjwWQDFyY whXJcFWvxPa9cqiHXs2Kkgw3YrCnW03UTs96YcZpLxXHD3EgHAON0LddK5jOZAmlXcV7 S9TN/x2Y7cv1gHcJglVbmEyqWwlz2yXkcnC4r9WjqwFifBQedcDJYrO1AGJCARZfhjqX PXXPU2e/kM7Srb3kfYIwp/us0ZjYp7bu3xKgggdzmKmV3S5jR6vkd+locDC4tnj3GWVH +QD3N6tKee/XwzPoBx3DbsqIaq5j8jZqKJsewEm+i2QKDgyqR3WwCp6wH0ZURIYb7YbN oEQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679323641; 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=QD7ylI6TVHUGdBJgMovYJYcYKC/vfqGxmwJNLbiL6ds=; b=Kp7QVBDVz3wq1IZc3nZa5MG4W0OWRWbJ5lQXE8kfbK+fkA7VCdhAwCIzgX1NZVFq5y Bep/rNfAWku+9H+AciqDiu6/R0yMezWCge4r2e/5Gs9YDq4MOAqVNsf0pJT4jSmvPY2w QWsJPJnnlMXqfy42kXA1RwQmevCgWkrJM2QNdCwoojWYk0q6Znx1MKpW2AsFE2HgyV51 QIyTrFqRrADlhNz6LKK6Deh2F22AyXsnEJy3RD26/4ZRP+4MBb0PQZQo63JlSxw2Im4S ClNGCLfk+uduaQZ0qM7sTcFQbIdjLFA0gReeuJB3IwFDKLTiSVXbKmAnisdUphA/n/sr XwKQ== X-Gm-Message-State: AO0yUKWFuS4D8zztu/NTqoRREP3NeDjV0i/JHXg26RySbABNAz+nN2eT QMlQsu5PACCW6X9/Yn8cS3PH2A== X-Received: by 2002:a05:6402:7c3:b0:4fa:4b1c:5ea3 with SMTP id u3-20020a05640207c300b004fa4b1c5ea3mr12880116edy.23.1679323641641; Mon, 20 Mar 2023 07:47:21 -0700 (PDT) Received: from localhost.localdomain ([94.52.112.99]) by smtp.gmail.com with ESMTPSA id x2-20020a50ba82000000b004fb30fc1dabsm4913172ede.96.2023.03.20.07.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 07:47:21 -0700 (PDT) From: Abel Vesa To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Bjorn Helgaas , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , Philipp Zabel , Linux Kernel Mailing List Cc: linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, Johan Hovold Subject: [RESEND PATCH v9 2/2] PCI: qcom: Add SM8550 PCIe support Date: Mon, 20 Mar 2023 16:46:58 +0200 Message-Id: <20230320144658.1794991-2-abel.vesa@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230320144658.1794991-1-abel.vesa@linaro.org> References: <20230320144658.1794991-1-abel.vesa@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 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?1760899300876435065?= X-GMAIL-MSGID: =?utf-8?q?1760899300876435065?= Add compatible for both PCIe found on SM8550. Also add the noc_aggr and cnoc_sf_axi clocks needed by the SM8550. Signed-off-by: Abel Vesa Reviewed-by: Konrad Dybcio Reviewed-by: Manivannan Sadhasivam Reviewed-by: Johan Hovold --- This patch is a resend of the following: https://lore.kernel.org/all/20230208180020.2761766-11-abel.vesa@linaro.org/ No changes since then. drivers/pci/controller/dwc/pcie-qcom.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index a232b04af048..6a70c9c6f98d 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -182,10 +182,10 @@ struct qcom_pcie_resources_2_3_3 { /* 6 clocks typically, 7 for sm8250 */ struct qcom_pcie_resources_2_7_0 { - struct clk_bulk_data clks[12]; + struct clk_bulk_data clks[14]; int num_clks; struct regulator_bulk_data supplies[2]; - struct reset_control *pci_reset; + struct reset_control *rst; }; struct qcom_pcie_resources_2_9_0 { @@ -1177,9 +1177,9 @@ static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie) unsigned int idx; int ret; - res->pci_reset = devm_reset_control_get_exclusive(dev, "pci"); - if (IS_ERR(res->pci_reset)) - return PTR_ERR(res->pci_reset); + res->rst = devm_reset_control_array_get_exclusive(dev); + if (IS_ERR(res->rst)) + return PTR_ERR(res->rst); res->supplies[0].supply = "vdda"; res->supplies[1].supply = "vddpe-3v3"; @@ -1205,9 +1205,11 @@ static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie) res->clks[idx++].id = "ddrss_sf_tbu"; res->clks[idx++].id = "aggre0"; res->clks[idx++].id = "aggre1"; + res->clks[idx++].id = "noc_aggr"; res->clks[idx++].id = "noc_aggr_4"; res->clks[idx++].id = "noc_aggr_south_sf"; res->clks[idx++].id = "cnoc_qx"; + res->clks[idx++].id = "cnoc_sf_axi"; num_opt_clks = idx - num_clks; res->num_clks = idx; @@ -1237,17 +1239,17 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) if (ret < 0) goto err_disable_regulators; - ret = reset_control_assert(res->pci_reset); - if (ret < 0) { - dev_err(dev, "cannot assert pci reset\n"); + ret = reset_control_assert(res->rst); + if (ret) { + dev_err(dev, "reset assert failed (%d)\n", ret); goto err_disable_clocks; } usleep_range(1000, 1500); - ret = reset_control_deassert(res->pci_reset); - if (ret < 0) { - dev_err(dev, "cannot deassert pci reset\n"); + ret = reset_control_deassert(res->rst); + if (ret) { + dev_err(dev, "reset deassert failed (%d)\n", ret); goto err_disable_clocks; } @@ -1841,6 +1843,7 @@ static const struct of_device_id qcom_pcie_match[] = { { .compatible = "qcom,pcie-sm8350", .data = &cfg_1_9_0 }, { .compatible = "qcom,pcie-sm8450-pcie0", .data = &cfg_1_9_0 }, { .compatible = "qcom,pcie-sm8450-pcie1", .data = &cfg_1_9_0 }, + { .compatible = "qcom,pcie-sm8550", .data = &cfg_1_9_0 }, { } };