You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
204 lines
8.7 KiB
Diff
204 lines
8.7 KiB
Diff
From patchwork Thu May 28 06:16:48 2020
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Chuanjia Liu <chuanjia.liu@mediatek.com>
|
|
X-Patchwork-Id: 11574797
|
|
Return-Path:
|
|
<SRS0=ftSA=7K=lists.infradead.org=linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@kernel.org>
|
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
|
[172.30.200.123])
|
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30A5E1392
|
|
for <patchwork-linux-mediatek@patchwork.kernel.org>;
|
|
Thu, 28 May 2020 06:29:05 +0000 (UTC)
|
|
Received: from bombadil.infradead.org (bombadil.infradead.org
|
|
[198.137.202.133])
|
|
(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 08B6320721
|
|
for <patchwork-linux-mediatek@patchwork.kernel.org>;
|
|
Thu, 28 May 2020 06:29:05 +0000 (UTC)
|
|
Authentication-Results: mail.kernel.org;
|
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
|
header.i=@lists.infradead.org header.b="auhxDafY";
|
|
dkim=fail reason="signature verification failed" (1024-bit key)
|
|
header.d=mediatek.com header.i=@mediatek.com header.b="Kj09Arxb"
|
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 08B6320721
|
|
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+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org
|
|
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
|
d=lists.infradead.org; s=bombadil.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=+QPxF1vlOH7StIZYuXJa3V40x8QVDxCLF9AFXHblB9M=; b=auhxDafYBeaUZO
|
|
aYp2KVO8Aie0v4tYtRwBon7hF+x55JwD78SAxQR2RsSvrlOo9cMYYby+ToUWflVUWQ60FapAl+w+l
|
|
nkEjIOrLBErHwxNOcsD8T5kjyCBMqlz4OMAQYUDNJ3fSugRlGhOtxkjCGd9ebB8N2Rvu6/U8P1A9n
|
|
P15mEQoc+RLonR1+9mBgwTEXErjsraxkimTD4Txsp4IvMs3UdsMkP+r3OT5S/p+Uj6O9ES0h7xIon
|
|
aL79KaVqRLHrfZxnrVwuGiecAiTp8qLy9clHuJU32NA6ZcXH1OnWipKApgp8Ck7ys80WPKaMrat9B
|
|
XuskJ63w13DZAbCVvuGQ==;
|
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
|
by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jeC2J-00014n-M9; Thu, 28 May 2020 06:29:03 +0000
|
|
Received: from mailgw02.mediatek.com ([216.200.240.185])
|
|
by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
|
|
id 1jeC2H-00013t-Li; Thu, 28 May 2020 06:29:03 +0000
|
|
X-UUID: a4877c1586e64afeb2d6172e10605d2b-20200527
|
|
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=CIwcBFK1x0LbOjDt1BG6/knHFxDHRiqj8ov/jWEZDBY=;
|
|
b=Kj09ArxbnLVTc9bpaVPT3jQrIVjhL87sSYyVF9dFypS976k78Ce9gZd0f4K3zAZbYZHYoQtuyOQ9TOeufQfgD+Cr+j5VR7pTdO2E1iXHFs/eQAz5gAjvjlK01z1JiunrLnn9dvIr6c1gEkjQHny0VpuZ1duxx79jwYusg/Nw6Wc=;
|
|
X-UUID: a4877c1586e64afeb2d6172e10605d2b-20200527
|
|
Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by
|
|
mailgw02.mediatek.com
|
|
(envelope-from <chuanjia.liu@mediatek.com>)
|
|
(musrelay.mediatek.com ESMTP with TLS)
|
|
with ESMTP id 899663677; Wed, 27 May 2020 22:29:21 -0800
|
|
Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by
|
|
MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id
|
|
15.0.1497.2; Wed, 27 May 2020 23:18:50 -0700
|
|
Received: from mtkcas07.mediatek.inc (172.21.101.84) by
|
|
mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id
|
|
15.0.1497.2; Thu, 28 May 2020 14:18:54 +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, 28 May 2020 14:18:52 +0800
|
|
From: <chuanjia.liu@mediatek.com>
|
|
To: <robh+dt@kernel.org>, <ryder.lee@mediatek.com>, <matthias.bgg@gmail.com>
|
|
Subject: [PATCH v2 4/4] ARM: dts: mediatek: Update mt7629 PCIe node
|
|
Date: Thu, 28 May 2020 14:16:48 +0800
|
|
Message-ID: <20200528061648.32078-5-chuanjia.liu@mediatek.com>
|
|
X-Mailer: git-send-email 2.18.0
|
|
In-Reply-To: <20200528061648.32078-1-chuanjia.liu@mediatek.com>
|
|
References: <20200528061648.32078-1-chuanjia.liu@mediatek.com>
|
|
MIME-Version: 1.0
|
|
X-MTK: N
|
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
|
X-CRM114-CacheID: sfid-20200527_232901_719172_E5A99C62
|
|
X-CRM114-Status: GOOD ( 11.61 )
|
|
X-Spam-Score: -0.2 (/)
|
|
X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary:
|
|
Content analysis details: (-0.2 points)
|
|
pts rule name description
|
|
---- ----------------------
|
|
--------------------------------------------------
|
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
|
0.0 MIME_BASE64_TEXT RAW: Message text disguised using base64
|
|
encoding
|
|
-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from
|
|
author's domain
|
|
0.1 DKIM_SIGNED Message has a DKIM or DK signature,
|
|
not necessarily
|
|
valid
|
|
-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
|
|
-0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from
|
|
envelope-from domain
|
|
0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay
|
|
lines
|
|
X-BeenThere: linux-mediatek@lists.infradead.org
|
|
X-Mailman-Version: 2.1.29
|
|
Precedence: list
|
|
List-Id: <linux-mediatek.lists.infradead.org>
|
|
List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mediatek>,
|
|
<mailto:linux-mediatek-request@lists.infradead.org?subject=unsubscribe>
|
|
List-Archive: <http://lists.infradead.org/pipermail/linux-mediatek/>
|
|
List-Post: <mailto:linux-mediatek@lists.infradead.org>
|
|
List-Help: <mailto:linux-mediatek-request@lists.infradead.org?subject=help>
|
|
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mediatek>,
|
|
<mailto:linux-mediatek-request@lists.infradead.org?subject=subscribe>
|
|
Cc: devicetree@vger.kernel.org, lorenzo.pieralisi@arm.com,
|
|
srv_heupstream@mediatek.com, "chuanjia.liu" <Chuanjia.Liu@mediatek.com>,
|
|
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
|
|
jianjun.wang@mediatek.com, linux-mediatek@lists.infradead.org,
|
|
yong.wu@mediatek.com, bhelgaas@google.com,
|
|
linux-arm-kernel@lists.infradead.org, amurray@thegoodpenguin.co.uk
|
|
Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org>
|
|
Errors-To:
|
|
linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org
|
|
|
|
From: "chuanjia.liu" <Chuanjia.Liu@mediatek.com>
|
|
|
|
Remove unused property and add pciecfg node.
|
|
|
|
Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
|
|
---
|
|
arch/arm/boot/dts/mt7629-rfb.dts | 3 ++-
|
|
arch/arm/boot/dts/mt7629.dtsi | 23 +++++++++++++----------
|
|
2 files changed, 15 insertions(+), 11 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/mt7629-rfb.dts
|
|
+++ b/arch/arm/boot/dts/mt7629-rfb.dts
|
|
@@ -171,9 +171,10 @@
|
|
};
|
|
};
|
|
|
|
-&pcie {
|
|
+&pcie1 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pcie_pins>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&pciephy1 {
|
|
--- a/arch/arm/boot/dts/mt7629.dtsi
|
|
+++ b/arch/arm/boot/dts/mt7629.dtsi
|
|
@@ -368,16 +368,21 @@
|
|
#reset-cells = <1>;
|
|
};
|
|
|
|
- pcie: pcie@1a140000 {
|
|
+ pciecfg: pciecfg@1a140000 {
|
|
+ compatible = "mediatek,mt7629-pciecfg", "syscon";
|
|
+ reg = <0x1a140000 0x1000>;
|
|
+ };
|
|
+
|
|
+ pcie1: pcie@1a145000 {
|
|
compatible = "mediatek,mt7629-pcie";
|
|
device_type = "pci";
|
|
- reg = <0x1a140000 0x1000>,
|
|
- <0x1a145000 0x1000>;
|
|
- reg-names = "subsys","port1";
|
|
+ reg = <0x1a145000 0x1000>;
|
|
+ reg-names = "port1";
|
|
+ mediatek,pcie-cfg = <&pciecfg>;
|
|
#address-cells = <3>;
|
|
#size-cells = <2>;
|
|
- interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_LOW>,
|
|
- <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
|
|
+ interrupt-names = "pcie_irq";
|
|
clocks = <&pciesys CLK_PCIE_P1_MAC_EN>,
|
|
<&pciesys CLK_PCIE_P0_AHB_EN>,
|
|
<&pciesys CLK_PCIE_P1_AUX_EN>,
|
|
@@ -398,21 +403,19 @@
|
|
power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>;
|
|
bus-range = <0x00 0xff>;
|
|
ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>;
|
|
+ status = "disabled";
|
|
|
|
- pcie1: pcie@1,0 {
|
|
- device_type = "pci";
|
|
+ slot1: pcie@1,0 {
|
|
reg = <0x0800 0 0 0 0>;
|
|
#address-cells = <3>;
|
|
#size-cells = <2>;
|
|
#interrupt-cells = <1>;
|
|
ranges;
|
|
- num-lanes = <1>;
|
|
interrupt-map-mask = <0 0 0 7>;
|
|
interrupt-map = <0 0 0 1 &pcie_intc1 0>,
|
|
<0 0 0 2 &pcie_intc1 1>,
|
|
<0 0 0 3 &pcie_intc1 2>,
|
|
<0 0 0 4 &pcie_intc1 3>;
|
|
-
|
|
pcie_intc1: interrupt-controller {
|
|
interrupt-controller;
|
|
#address-cells = <0>;
|