From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03137C2D0A3 for ; Thu, 29 Oct 2020 08:15:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C24420720 for ; Thu, 29 Oct 2020 08:15:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="ChLnOLZz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727244AbgJ2IPr (ORCPT ); Thu, 29 Oct 2020 04:15:47 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:53487 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728510AbgJ2IPp (ORCPT ); Thu, 29 Oct 2020 04:15:45 -0400 X-UUID: d13f7f1ea5144932abb169e0728117cb-20201029 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=XMZxyn6b3FBsdxBCB2TKGC6CA3eMv9x5H8CXbCfu32I=; b=ChLnOLZzD98Hv8XXA3ysYu4RDa1fNXWBgT6eZRRCDit9USmq2B/wnqVjSlCcAuQS/sw+2G8nK/DlBkDhfpqFxul87xhBVO1pyqJqlJ57Nir57fB9CX66ilLxCBsaLPDxcOHKLQiH1kawqCvYwhElmES+B95wv1D9DIi/omr5iYY=; X-UUID: d13f7f1ea5144932abb169e0728117cb-20201029 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.14 Build 0819 with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1601999279; Thu, 29 Oct 2020 16:15:34 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 29 Oct 2020 16:15:31 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 29 Oct 2020 16:15:31 +0800 From: Chuanjia Liu To: Rob Herring , Lorenzo Pieralisi CC: Bjorn Helgaas , Matthias Brugger , , , , , , Frank Wunderlich , Ryder Lee , Subject: [PATCH v7 2/4] PCI: mediatek: Add new method to get shared pcie-cfg base and irq Date: Thu, 29 Oct 2020 16:15:11 +0800 Message-ID: <20201029081513.10562-3-chuanjia.liu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20201029081513.10562-1-chuanjia.liu@mediatek.com> References: <20201029081513.10562-1-chuanjia.liu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: 9C279CAB933F5525C2B98DF3722B1F281CCCD40D526927B3E7820706685DC4622000:8 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org QWRkIG5ldyBtZXRob2QgdG8gZ2V0IHNoYXJlZCBwY2llLWNmZyBiYXNlIGFuZCBwY2llIGlycSBm b3INCm5ldyBkdHMgZm9ybWF0Lg0KDQpTaWduZWQtb2ZmLWJ5OiBDaHVhbmppYSBMaXUgPGNodWFu amlhLmxpdUBtZWRpYXRlay5jb20+DQpBY2tlZC1ieTogUnlkZXIgTGVlIDxyeWRlci5sZWVAbWVk aWF0ZWsuY29tPg0KLS0tDQogZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2llLW1lZGlhdGVrLmMg fCAyMyArKysrKysrKysrKysrKysrKysrKysrLQ0KIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9uKC0pDQoNCmRpZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9jb250cm9s bGVyL3BjaWUtbWVkaWF0ZWsuYyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1tZWRpYXRl ay5jDQppbmRleCBjZjRjMThmMGMyNWEuLjViOTE1ZWIwY2YxZSAxMDA2NDQNCi0tLSBhL2RyaXZl cnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1tZWRpYXRlay5jDQorKysgYi9kcml2ZXJzL3BjaS9jb250 cm9sbGVyL3BjaWUtbWVkaWF0ZWsuYw0KQEAgLTE0LDYgKzE0LDcgQEANCiAjaW5jbHVkZSA8bGlu dXgvaXJxY2hpcC9jaGFpbmVkX2lycS5oPg0KICNpbmNsdWRlIDxsaW51eC9pcnFkb21haW4uaD4N CiAjaW5jbHVkZSA8bGludXgva2VybmVsLmg+DQorI2luY2x1ZGUgPGxpbnV4L21mZC9zeXNjb24u aD4NCiAjaW5jbHVkZSA8bGludXgvbXNpLmg+DQogI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPg0K ICNpbmNsdWRlIDxsaW51eC9vZl9hZGRyZXNzLmg+DQpAQCAtMjMsNiArMjQsNyBAQA0KICNpbmNs dWRlIDxsaW51eC9waHkvcGh5Lmg+DQogI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5o Pg0KICNpbmNsdWRlIDxsaW51eC9wbV9ydW50aW1lLmg+DQorI2luY2x1ZGUgPGxpbnV4L3JlZ21h cC5oPg0KICNpbmNsdWRlIDxsaW51eC9yZXNldC5oPg0KIA0KICNpbmNsdWRlICIuLi9wY2kuaCIN CkBAIC0yMDUsNiArMjA3LDcgQEAgc3RydWN0IG10a19wY2llX3BvcnQgew0KICAqIHN0cnVjdCBt dGtfcGNpZSAtIFBDSWUgaG9zdCBpbmZvcm1hdGlvbg0KICAqIEBkZXY6IHBvaW50ZXIgdG8gUENJ ZSBkZXZpY2UNCiAgKiBAYmFzZTogSU8gbWFwcGVkIHJlZ2lzdGVyIGJhc2UNCisgKiBAY2ZnOiBJ TyBtYXBwZWQgcmVnaXN0ZXIgbWFwIGZvciBQQ0llIGNvbmZpZw0KICAqIEBmcmVlX2NrOiBmcmVl LXJ1biByZWZlcmVuY2UgY2xvY2sNCiAgKiBAbWVtOiBub24tcHJlZmV0Y2hhYmxlIG1lbW9yeSBy ZXNvdXJjZQ0KICAqIEBwb3J0czogcG9pbnRlciB0byBQQ0llIHBvcnQgaW5mb3JtYXRpb24NCkBA IC0yMTMsNiArMjE2LDcgQEAgc3RydWN0IG10a19wY2llX3BvcnQgew0KIHN0cnVjdCBtdGtfcGNp ZSB7DQogCXN0cnVjdCBkZXZpY2UgKmRldjsNCiAJdm9pZCBfX2lvbWVtICpiYXNlOw0KKwlzdHJ1 Y3QgcmVnbWFwICpjZmc7DQogCXN0cnVjdCBjbGsgKmZyZWVfY2s7DQogDQogCXN0cnVjdCBsaXN0 X2hlYWQgcG9ydHM7DQpAQCAtNjQ4LDcgKzY1MiwxMSBAQCBzdGF0aWMgaW50IG10a19wY2llX3Nl dHVwX2lycShzdHJ1Y3QgbXRrX3BjaWVfcG9ydCAqcG9ydCwNCiAJCXJldHVybiBlcnI7DQogCX0N CiANCi0JcG9ydC0+aXJxID0gcGxhdGZvcm1fZ2V0X2lycShwZGV2LCBwb3J0LT5zbG90KTsNCisJ aWYgKG9mX2ZpbmRfcHJvcGVydHkoZGV2LT5vZl9ub2RlLCAiaW50ZXJydXB0LW5hbWVzIiwgTlVM TCkpDQorCQlwb3J0LT5pcnEgPSBwbGF0Zm9ybV9nZXRfaXJxX2J5bmFtZShwZGV2LCAicGNpZV9p cnEiKTsNCisJZWxzZQ0KKwkJcG9ydC0+aXJxID0gcGxhdGZvcm1fZ2V0X2lycShwZGV2LCBwb3J0 LT5zbG90KTsNCisNCiAJaWYgKHBvcnQtPmlycSA8IDApDQogCQlyZXR1cm4gcG9ydC0+aXJxOw0K IA0KQEAgLTY4MCw2ICs2ODgsMTAgQEAgc3RhdGljIGludCBtdGtfcGNpZV9zdGFydHVwX3BvcnRf djIoc3RydWN0IG10a19wY2llX3BvcnQgKnBvcnQpDQogCQl2YWwgfD0gUENJRV9DU1JfTFRTU01f RU4ocG9ydC0+c2xvdCkgfA0KIAkJICAgICAgIFBDSUVfQ1NSX0FTUE1fTDFfRU4ocG9ydC0+c2xv dCk7DQogCQl3cml0ZWwodmFsLCBwY2llLT5iYXNlICsgUENJRV9TWVNfQ0ZHX1YyKTsNCisJfSBl bHNlIGlmIChwY2llLT5jZmcpIHsNCisJCXZhbCA9IFBDSUVfQ1NSX0xUU1NNX0VOKHBvcnQtPnNs b3QpIHwNCisJCSAgICAgIFBDSUVfQ1NSX0FTUE1fTDFfRU4ocG9ydC0+c2xvdCk7DQorCQlyZWdt YXBfdXBkYXRlX2JpdHMocGNpZS0+Y2ZnLCBQQ0lFX1NZU19DRkdfVjIsIHZhbCwgdmFsKTsNCiAJ fQ0KIA0KIAkvKiBBc3NlcnQgYWxsIHJlc2V0IHNpZ25hbHMgKi8NCkBAIC05ODMsNiArOTk1LDcg QEAgc3RhdGljIGludCBtdGtfcGNpZV9zdWJzeXNfcG93ZXJ1cChzdHJ1Y3QgbXRrX3BjaWUgKnBj aWUpDQogCXN0cnVjdCBkZXZpY2UgKmRldiA9IHBjaWUtPmRldjsNCiAJc3RydWN0IHBsYXRmb3Jt X2RldmljZSAqcGRldiA9IHRvX3BsYXRmb3JtX2RldmljZShkZXYpOw0KIAlzdHJ1Y3QgcmVzb3Vy Y2UgKnJlZ3M7DQorCXN0cnVjdCBkZXZpY2Vfbm9kZSAqY2ZnX25vZGU7DQogCWludCBlcnI7DQog DQogCS8qIGdldCBzaGFyZWQgcmVnaXN0ZXJzLCB3aGljaCBhcmUgb3B0aW9uYWwgKi8NCkBAIC05 OTUsNiArMTAwOCwxNCBAQCBzdGF0aWMgaW50IG10a19wY2llX3N1YnN5c19wb3dlcnVwKHN0cnVj dCBtdGtfcGNpZSAqcGNpZSkNCiAJCX0NCiAJfQ0KIA0KKwljZmdfbm9kZSA9IG9mX2ZpbmRfY29t cGF0aWJsZV9ub2RlKE5VTEwsIE5VTEwsDQorCQkJCQkgICAibWVkaWF0ZWssZ2VuZXJpYy1wY2ll Y2ZnIik7DQorCWlmIChjZmdfbm9kZSkgew0KKwkJcGNpZS0+Y2ZnID0gc3lzY29uX25vZGVfdG9f cmVnbWFwKGNmZ19ub2RlKTsNCisJCWlmIChJU19FUlIocGNpZS0+Y2ZnKSkNCisJCQlyZXR1cm4g UFRSX0VSUihwY2llLT5jZmcpOw0KKwl9DQorDQogCXBjaWUtPmZyZWVfY2sgPSBkZXZtX2Nsa19n ZXQoZGV2LCAiZnJlZV9jayIpOw0KIAlpZiAoSVNfRVJSKHBjaWUtPmZyZWVfY2spKSB7DQogCQlp ZiAoUFRSX0VSUihwY2llLT5mcmVlX2NrKSA9PSAtRVBST0JFX0RFRkVSKQ0KLS0gDQoyLjE4LjAN Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED9E1C55178 for ; Thu, 29 Oct 2020 08:15:53 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 693A22071A for ; Thu, 29 Oct 2020 08:15:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GYyLKPH7"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="aUCcaipU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 693A22071A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vwIXaiWpnUgLQqHubPAfbzR2vuXLbKc0mVlVEbJc9eo=; b=GYyLKPH7K5KMAfPqzd79h5uDo K4B7ti/FBbkkGfFRXzIuiKHqnp1z/VFe9yHmbvQPmiXlXQHVj5GykGGMQJc6egfnuuPptCPs8N6/R B7zHyphRYHRSK/kzeEuqgbzGbS1M4Mp32aEGcSkGA9aFuO1zGvaVg6/tIxXM/wdySuotMPusDGYwn yrukpm43t+qeo0ZLB3Fof5UJUChSR+EG+/QkHGLl1kG4ngBWp6ozQBRjrPp4ihpJwVhK7+rdb+QPK Q1hm8YmIO6iyq6Dsag4s0iXMkMUitSUB3V2Zi35h7J7vQadv/oFqlZ+NrWbxW2V9AIh1tg5KDw/do i/VXvP99w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kY360-0006L1-Fl; Thu, 29 Oct 2020 08:15:44 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kY35y-0006Jk-D1; Thu, 29 Oct 2020 08:15:43 +0000 X-UUID: aee984493b314dd0a5b424ef6768c1d7-20201029 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=XMZxyn6b3FBsdxBCB2TKGC6CA3eMv9x5H8CXbCfu32I=; b=aUCcaipUCnCQ8QjYW4R0m2HFAcoCI+SiIllLj8fB6Ig2/r0jAlmPCpRzo8qmFRs725w+rh9YFJx1SYbH3toolvFhSK4ibAPm3SrVsMyQZ+J/KDTMfhH6Qhhncz2jc+hwJnJnomQIjt8N86chNtom/hywpARbAHZGP5yaj+FUTPQ=; X-UUID: aee984493b314dd0a5b424ef6768c1d7-20201029 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 826783129; Thu, 29 Oct 2020 00:15:37 -0800 Received: from mtkmbs08n2.mediatek.inc (172.21.101.56) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 29 Oct 2020 01:15:34 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 29 Oct 2020 16:15:31 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 29 Oct 2020 16:15:31 +0800 From: Chuanjia Liu To: Rob Herring , Lorenzo Pieralisi Subject: [PATCH v7 2/4] PCI: mediatek: Add new method to get shared pcie-cfg base and irq Date: Thu, 29 Oct 2020 16:15:11 +0800 Message-ID: <20201029081513.10562-3-chuanjia.liu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20201029081513.10562-1-chuanjia.liu@mediatek.com> References: <20201029081513.10562-1-chuanjia.liu@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 9C279CAB933F5525C2B98DF3722B1F281CCCD40D526927B3E7820706685DC4622000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201029_041542_631778_7AC1F1DD X-CRM114-Status: GOOD ( 16.23 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Ryder Lee , Frank Wunderlich , linux-pci@vger.kernel.org, chuanjia.liu@mediatek.com, Matthias Brugger , linux-mediatek@lists.infradead.org, yong.wu@mediatek.com, Bjorn Helgaas , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Add new method to get shared pcie-cfg base and pcie irq for new dts format. Signed-off-by: Chuanjia Liu Acked-by: Ryder Lee --- drivers/pci/controller/pcie-mediatek.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index cf4c18f0c25a..5b915eb0cf1e 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -23,6 +24,7 @@ #include #include #include +#include #include #include "../pci.h" @@ -205,6 +207,7 @@ struct mtk_pcie_port { * struct mtk_pcie - PCIe host information * @dev: pointer to PCIe device * @base: IO mapped register base + * @cfg: IO mapped register map for PCIe config * @free_ck: free-run reference clock * @mem: non-prefetchable memory resource * @ports: pointer to PCIe port information @@ -213,6 +216,7 @@ struct mtk_pcie_port { struct mtk_pcie { struct device *dev; void __iomem *base; + struct regmap *cfg; struct clk *free_ck; struct list_head ports; @@ -648,7 +652,11 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port, return err; } - port->irq = platform_get_irq(pdev, port->slot); + if (of_find_property(dev->of_node, "interrupt-names", NULL)) + port->irq = platform_get_irq_byname(pdev, "pcie_irq"); + else + port->irq = platform_get_irq(pdev, port->slot); + if (port->irq < 0) return port->irq; @@ -680,6 +688,10 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port) val |= PCIE_CSR_LTSSM_EN(port->slot) | PCIE_CSR_ASPM_L1_EN(port->slot); writel(val, pcie->base + PCIE_SYS_CFG_V2); + } else if (pcie->cfg) { + val = PCIE_CSR_LTSSM_EN(port->slot) | + PCIE_CSR_ASPM_L1_EN(port->slot); + regmap_update_bits(pcie->cfg, PCIE_SYS_CFG_V2, val, val); } /* Assert all reset signals */ @@ -983,6 +995,7 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie) struct device *dev = pcie->dev; struct platform_device *pdev = to_platform_device(dev); struct resource *regs; + struct device_node *cfg_node; int err; /* get shared registers, which are optional */ @@ -995,6 +1008,14 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie) } } + cfg_node = of_find_compatible_node(NULL, NULL, + "mediatek,generic-pciecfg"); + if (cfg_node) { + pcie->cfg = syscon_node_to_regmap(cfg_node); + if (IS_ERR(pcie->cfg)) + return PTR_ERR(pcie->cfg); + } + pcie->free_ck = devm_clk_get(dev, "free_ck"); if (IS_ERR(pcie->free_ck)) { if (PTR_ERR(pcie->free_ck) == -EPROBE_DEFER) -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E265C55178 for ; Thu, 29 Oct 2020 08:17:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D0172076E for ; Thu, 29 Oct 2020 08:17:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TU50QpHt"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="aUCcaipU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D0172076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GQNLWR4DydkbbbzwMwfeiB7fUgiZVAY/I9U4rnUXYA0=; b=TU50QpHtS4AR8/v1XsV7hQtDj 33IVdjpNSv7zU2Kp7ej9Nu/z/+tCA9xjC1RNlSe+1dHlkmFjQKyPakmWf2bjyTctfPciybnmoN+0c 54CshawGSc2VLL8RBdsrwv0GouYaBnfzm5n49r5V8c24wGp4E7M2eowVYNX44t6owl1OGxUuaacks gMchv18nBC6AqAq9z1jzZyn2eIpdod++Oc2I75jQeXEkLxWPFQriy0mfZMGVWNih/UZzOBoqNJ/+V 3+s92xnzRoudTVkBYuGOdeQv1C5/nK9i8qFvI/roLS19JTcljMYwaA9DtJDNAXT14rhY1GnQHjOrL cvro2/K6Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kY363-0006Ll-OE; Thu, 29 Oct 2020 08:15:47 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kY35y-0006Jk-D1; Thu, 29 Oct 2020 08:15:43 +0000 X-UUID: aee984493b314dd0a5b424ef6768c1d7-20201029 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=XMZxyn6b3FBsdxBCB2TKGC6CA3eMv9x5H8CXbCfu32I=; b=aUCcaipUCnCQ8QjYW4R0m2HFAcoCI+SiIllLj8fB6Ig2/r0jAlmPCpRzo8qmFRs725w+rh9YFJx1SYbH3toolvFhSK4ibAPm3SrVsMyQZ+J/KDTMfhH6Qhhncz2jc+hwJnJnomQIjt8N86chNtom/hywpARbAHZGP5yaj+FUTPQ=; X-UUID: aee984493b314dd0a5b424ef6768c1d7-20201029 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 826783129; Thu, 29 Oct 2020 00:15:37 -0800 Received: from mtkmbs08n2.mediatek.inc (172.21.101.56) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 29 Oct 2020 01:15:34 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 29 Oct 2020 16:15:31 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 29 Oct 2020 16:15:31 +0800 From: Chuanjia Liu To: Rob Herring , Lorenzo Pieralisi Subject: [PATCH v7 2/4] PCI: mediatek: Add new method to get shared pcie-cfg base and irq Date: Thu, 29 Oct 2020 16:15:11 +0800 Message-ID: <20201029081513.10562-3-chuanjia.liu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20201029081513.10562-1-chuanjia.liu@mediatek.com> References: <20201029081513.10562-1-chuanjia.liu@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 9C279CAB933F5525C2B98DF3722B1F281CCCD40D526927B3E7820706685DC4622000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201029_041542_631778_7AC1F1DD X-CRM114-Status: GOOD ( 16.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Ryder Lee , Frank Wunderlich , linux-pci@vger.kernel.org, chuanjia.liu@mediatek.com, Matthias Brugger , linux-mediatek@lists.infradead.org, yong.wu@mediatek.com, Bjorn Helgaas , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add new method to get shared pcie-cfg base and pcie irq for new dts format. Signed-off-by: Chuanjia Liu Acked-by: Ryder Lee --- drivers/pci/controller/pcie-mediatek.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index cf4c18f0c25a..5b915eb0cf1e 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -23,6 +24,7 @@ #include #include #include +#include #include #include "../pci.h" @@ -205,6 +207,7 @@ struct mtk_pcie_port { * struct mtk_pcie - PCIe host information * @dev: pointer to PCIe device * @base: IO mapped register base + * @cfg: IO mapped register map for PCIe config * @free_ck: free-run reference clock * @mem: non-prefetchable memory resource * @ports: pointer to PCIe port information @@ -213,6 +216,7 @@ struct mtk_pcie_port { struct mtk_pcie { struct device *dev; void __iomem *base; + struct regmap *cfg; struct clk *free_ck; struct list_head ports; @@ -648,7 +652,11 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port, return err; } - port->irq = platform_get_irq(pdev, port->slot); + if (of_find_property(dev->of_node, "interrupt-names", NULL)) + port->irq = platform_get_irq_byname(pdev, "pcie_irq"); + else + port->irq = platform_get_irq(pdev, port->slot); + if (port->irq < 0) return port->irq; @@ -680,6 +688,10 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port) val |= PCIE_CSR_LTSSM_EN(port->slot) | PCIE_CSR_ASPM_L1_EN(port->slot); writel(val, pcie->base + PCIE_SYS_CFG_V2); + } else if (pcie->cfg) { + val = PCIE_CSR_LTSSM_EN(port->slot) | + PCIE_CSR_ASPM_L1_EN(port->slot); + regmap_update_bits(pcie->cfg, PCIE_SYS_CFG_V2, val, val); } /* Assert all reset signals */ @@ -983,6 +995,7 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie) struct device *dev = pcie->dev; struct platform_device *pdev = to_platform_device(dev); struct resource *regs; + struct device_node *cfg_node; int err; /* get shared registers, which are optional */ @@ -995,6 +1008,14 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie) } } + cfg_node = of_find_compatible_node(NULL, NULL, + "mediatek,generic-pciecfg"); + if (cfg_node) { + pcie->cfg = syscon_node_to_regmap(cfg_node); + if (IS_ERR(pcie->cfg)) + return PTR_ERR(pcie->cfg); + } + pcie->free_ck = devm_clk_get(dev, "free_ck"); if (IS_ERR(pcie->free_ck)) { if (PTR_ERR(pcie->free_ck) == -EPROBE_DEFER) -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel