From patchwork Mon Oct 15 18:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 984332 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cvkzj4K4"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="pD4AwLEU"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BHzc3K/d"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42Yn7M046gz9sBZ for ; Tue, 16 Oct 2018 05:30:38 +1100 (AEDT) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=u58dpg3Z/ncpvOFJjkCEtxa2g0sElilf4kYV6+WnLUU=; b=cvkzj4K4o7GliJmGnBrY4XJ+iY Q9q3htjHdB2k56yKRxlJplvKDOXPqUZeCRN9FZWD5tC7Fz38t4eZ6fbVIiQs9o8LwjHfeCqrVr//L ryMJq+3Vu3oVGMZ9sy+UL3GuhwYCUxgt6Hpoz8uSl1nWbLMN+eflzldUM+9Ys91rEQeauousjWqIl JTpEfGEzaHCVs/WVtKR2np8yQj6VkzsBxHeeZDBzA0HAVBde681E+y6ySmbNOFU9BF35D0pT7dYDL kicP6jg4FXp1ubddFmBSc9CK49g6BiNbGU3GzrGO/ShK3dg5488EUuf1thIJmm53liy25qksvPMz1 8OXoFO6w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gC7dF-0000n6-I4; Mon, 15 Oct 2018 18:30:21 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gC7cN-0007y0-Q9 for openwrt-devel@bombadil.infradead.org; Mon, 15 Oct 2018 18:29:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4UCygLRBcIb4/CPZhyfa2UqPzaApkyZvUfma96ImIBE=; b=pD4AwLEU/p54XNNNOzsqZHelxJ Je8+Mlwzp6LdnvGcqWtwvMGrvW6gYpvoPIskgpKGUNOx7uLw7RigzUtG9v8/4I21bD7kzU1bZsBA6 DcdCzsuANKSOmXlNSTbfquBro/1EyW47CIUttAJAsKtkkyHN4pOE/x7xxYDTFZ9cXZDNeEsZTfvaA /R77+fN4ZLR45Q+iQOjlMZRuT+iWIdfbLtv3PlCCDD28qc17sIFFQlvDe0N6SxLnug/nBk4tIxym+ o+C/p0iHkbWEARyVt2yXVFM4BIFg9HwB6s0Vs9YlQKxLUEYoVRcJ2H4tXkvrjeBqSa2FARsTniIdY rU92YgpA==; Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gC7AH-0005LO-1z for openwrt-devel@lists.openwrt.org; Mon, 15 Oct 2018 18:00:28 +0000 Received: by mail-ed1-x543.google.com with SMTP id d15-v6so18712204edq.6 for ; Mon, 15 Oct 2018 11:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4UCygLRBcIb4/CPZhyfa2UqPzaApkyZvUfma96ImIBE=; b=BHzc3K/dYaacKlQ+r97Z8sX9PZOGULUPUFjIJx4V0JSR/0VDaOiQ8T3YYfCOvoZeFq gNDsN6WQTnvH6Y4i0sxosEX+wAaUwZy86Kt06FSvqavO/DEg++YzwO6vboAKhF121zC5 A/TRggs/jOoiUD2JsX2eaSU5UPRHPKBPKYwKEWststUuT3XnGQoYWoS4qllm3Wcw8Pwz oeoZWkf2iP1iK9CFYQMh1sjc1dFWzcyD3FJpgOHCXwAUs40R4uXtrEDVVOR+PUrOhTtY Enuc2dUINyGrv7V1/Wozh2n12z+Aa4rEOZiYmbS4d0tuz3HYQvUfg4hOI4j/GjPa39vq PNXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4UCygLRBcIb4/CPZhyfa2UqPzaApkyZvUfma96ImIBE=; b=SzB4sZvbLmEkVQn0CzaXtLZDRdiFLAEIcV/+yvo3fUaUzYtxIyAcEVUj64zmTx33MV uXenntc9e5jCS8DxL4NG9g3Hbi3jz9hiLDRCUNoO15kNkGKkMhK3RwKWC8r5Ogaf1DrP UiH2gWgegWo89iX4Yshh7CQ2AzTvjF7cYX0QpMHuNA7+mZpD04AkcVNufK1pyCkhDLpN 31RJY5Lv9bHAGKS3wKgnYPUKA9ltiAu6SwWZnX9J+9ZAZHHL6jlF57gHreE5ARcqhqtp 45lYYIHGgJzSOWJNyhrPBmJsp/xW6X79IbmRt8yafa9pbRMbGlTf+aeyWY330mrKnhn5 Mw3A== X-Gm-Message-State: ABuFfogkHPvEbfCuzYYQNPYXoeqkXmLjHIdUopKuhflZtQaro0ThTiFE +QcSls2CMTkWJp9ngy7CP8wnc/UrdPo= X-Google-Smtp-Source: ACcGV62sEFAcn78aJ7AsHHYdOm3EuqoZzxLBLZgF2lhF8LlbF5GEchTEh9emNLLj/s8cuK9XO8afiQ== X-Received: by 2002:a50:d1d7:: with SMTP id i23-v6mr26064567edg.34.1539626413130; Mon, 15 Oct 2018 11:00:13 -0700 (PDT) Received: from debian64.daheim (p200300D5FBC1DCFCD63D7EFFFEBDE96E.dip0.t-ipconnect.de. [2003:d5:fbc1:dcfc:d63d:7eff:febd:e96e]) by smtp.gmail.com with ESMTPSA id e38-v6sm5031387eda.67.2018.10.15.11.00.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 11:00:10 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.91) (envelope-from ) id 1gC7A1-0005hW-O5 for openwrt-devel@lists.openwrt.org; Mon, 15 Oct 2018 20:00:09 +0200 From: Christian Lamparter To: openwrt-devel@lists.openwrt.org Date: Mon, 15 Oct 2018 20:00:08 +0200 Message-Id: <53ae5202057bdc5a6f876a3877dd88beaac40a28.1539626110.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: References: <3c1901c2572d60d143d398bdcd12ea51d20da0f2.1539626110.git.chunkeey@gmail.com> <74ba72893a16e4cd80a3f09a0c31771ec0ae5c22.1539626110.git.chunkeey@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181015_190025_117267_3D01DA8F X-CRM114-Status: GOOD ( 14.94 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (-0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -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 Subject: [OpenWrt-Devel] [PATCH 4/5] apm821xx: apm82181.dtsi overhaul X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org - order entries by mmio address where possible - switch to lower-case address values - comment on BSP u-boot behaviour in regards to what it edits and look for - annotate irq lines with the help of interrupt-names - remove deprecated "device_type" properties The pci and network device_type had to stay since they are required by the drivers and u-boot. the cpu and memory device_types will remain as well as they are still part of the DT Spec. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/dts/apm82181.dtsi | 274 ++++++++++++------------ 1 file changed, 139 insertions(+), 135 deletions(-) diff --git a/target/linux/apm821xx/dts/apm82181.dtsi b/target/linux/apm821xx/dts/apm82181.dtsi index 79596da672..951f3d5f08 100644 --- a/target/linux/apm821xx/dts/apm82181.dtsi +++ b/target/linux/apm821xx/dts/apm82181.dtsi @@ -32,7 +32,7 @@ compatible = "apm,bluestone"; aliases { - ethernet0 = &EMAC0; + ethernet0 = &EMAC0; /* needed for BSP u-boot */ }; cpus { @@ -61,7 +61,7 @@ }; UIC0: interrupt-controller0 { - compatible = "apm,uic-apm82181","ibm,uic"; + compatible = "apm,uic-apm82181", "ibm,uic"; interrupt-controller; cell-index = <0>; dcr-reg = <0x0c0 0x009>; @@ -71,28 +71,28 @@ }; UIC1: interrupt-controller1 { - compatible = "apm,uic-apm82181","ibm,uic"; + compatible = "apm,uic-apm82181", "ibm,uic"; interrupt-controller; cell-index = <1>; dcr-reg = <0x0d0 0x009>; #address-cells = <0>; #size-cells = <0>; #interrupt-cells = <2>; - interrupts = <0x1e IRQ_TYPE_LEVEL_HIGH - 0x1f IRQ_TYPE_LEVEL_HIGH>; /* cascade */ + interrupts = <0x1e IRQ_TYPE_LEVEL_HIGH>, + <0x1f IRQ_TYPE_LEVEL_HIGH>; /* cascade */ interrupt-parent = <&UIC0>; }; UIC2: interrupt-controller2 { - compatible = "apm,uic-apm82181","ibm,uic"; + compatible = "apm,uic-apm82181", "ibm,uic"; interrupt-controller; cell-index = <2>; dcr-reg = <0x0e0 0x009>; #address-cells = <0>; #size-cells = <0>; #interrupt-cells = <2>; - interrupts = <0x0a IRQ_TYPE_LEVEL_HIGH - 0x0b IRQ_TYPE_LEVEL_HIGH>; /* cascade */ + interrupts = <0x0a IRQ_TYPE_LEVEL_HIGH>, + <0x0b IRQ_TYPE_LEVEL_HIGH>; /* cascade */ interrupt-parent = <&UIC0>; }; @@ -104,8 +104,8 @@ #address-cells = <0>; #size-cells = <0>; #interrupt-cells = <2>; - interrupts = <0x10 IRQ_TYPE_LEVEL_HIGH - 0x11 IRQ_TYPE_LEVEL_HIGH>; /* cascade */ + interrupts = <0x10 IRQ_TYPE_LEVEL_HIGH>, + <0x11 IRQ_TYPE_LEVEL_HIGH>; /* cascade */ interrupt-parent = <&UIC0>; }; @@ -156,7 +156,7 @@ compatible = "apm,plb-apm82181", "ibm,plb-460ex", "ibm,plb4"; #address-cells = <2>; #size-cells = <1>; - ranges; + ranges; /* Filled in by U-Boot */ clock-frequency = <0>; /* Filled in by U-Boot */ SDRAM0: sdram { @@ -172,16 +172,15 @@ }; - CRYPTO: crypto@180000 { - compatible = "amcc,ppc460ex-crypto", "amcc,ppc4xx-crypto"; - reg = <4 0x00180000 0x80400>; - interrupt-parent = <&UIC0>; - interrupts = <0x1d IRQ_TYPE_LEVEL_HIGH>; + TRNG: trng@110000 { + compatible = "amcc,ppc460ex-rng", "ppc4xx-rng", "amcc, ppc4xx-trng"; + reg = <4 0x00110000 0x100>; + interrupt-parent = <&UIC1>; + interrupts = <0x03 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; PKA: pka@114000 { - device_type = "pka"; compatible = "ppc4xx-pka", "amcc,ppc4xx-pka", "amcc, ppc4xx-pka"; reg = <4 0x00114000 0x4000>; interrupt-parent = <&UIC0>; @@ -189,13 +188,12 @@ status = "disabled"; }; - TRNG: trng@110000 { - device_type = "trng"; - compatible = "amcc,ppc460ex-rng", "ppc4xx-rng", "amcc, ppc4xx-trng"; - reg = <4 0x00110000 0x100>; - interrupt-parent = <&UIC1>; - interrupts = <0x03 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; + CRYPTO: crypto@180000 { + compatible = "amcc,ppc460ex-crypto", "amcc,ppc4xx-crypto"; + reg = <4 0x00180000 0x80400>; + interrupt-parent = <&UIC0>; + interrupts = <0x1d IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; /* hardware option */ }; MAL0: mcmal { @@ -207,59 +205,19 @@ #address-cells = <0>; #size-cells = <0>; interrupt-parent = <&UIC2>; - interrupts = < 0x06 IRQ_TYPE_LEVEL_HIGH /*TXEOB*/ - 0x07 IRQ_TYPE_LEVEL_HIGH /*RXEOB*/ - 0x03 IRQ_TYPE_LEVEL_HIGH /*SERR*/ - 0x04 IRQ_TYPE_LEVEL_HIGH /*TXDE*/ - 0x05 IRQ_TYPE_LEVEL_HIGH /*RXDE*/ - 0x08 IRQ_TYPE_EDGE_FALLING /*TX0 COAL*/ - /*0x09 IRQ_TYPE_EDGE_FALLING TX1 COAL*/ - 0x0c IRQ_TYPE_EDGE_FALLING /*RX0 COAL*/ - /*0x0d IRQ_TYPE_EDGE_FALLING RX1 COAL*/>; - }; - - AHBDMA0: dma@bffd0800 { - compatible = "snps,dma-spear1340"; - reg = <4 0xbffd0800 0x400>; - interrupt-parent = <&UIC0>; - interrupts = <0x19 IRQ_TYPE_LEVEL_HIGH>; - #dma-cells = <3>; - /* use autoconfiguration for the dma setup */ - }; - - SATA0: sata@bffd1000 { - compatible = "amcc,sata-460ex"; - reg = <4 0xbffd1000 0x800>; - interrupt-parent = <&UIC0>; - interrupts = <0x1a IRQ_TYPE_LEVEL_HIGH>; - dmas = <&AHBDMA0 0 0 1>; - dma-names = "sata-dma"; - status = "disabled"; - }; - - SATA1: sata@bffd1800 { - compatible = "amcc,sata-460ex"; - reg = <4 0xbffd1800 0x800>; - interrupt-parent = <&UIC0>; - interrupts = <0x1b IRQ_TYPE_LEVEL_HIGH>; - dmas = <&AHBDMA0 1 0 2>; - dma-names = "sata-dma"; - status = "disabled"; - }; - - USBOTG0: usbotg@bff80000 { - compatible = "amcc,dwc-otg"; - reg = <4 0xbff80000 0x10000>; - interrupt-parent = <&USBOTG0>; - interrupts = <0 1 2>; - #interrupt-cells = <1>; - #address-cells = <0>; - #size-cells = <0>; - interrupt-map = <0 &UIC2 0x1c IRQ_TYPE_LEVEL_HIGH /* USB-OTG */ - 1 &UIC1 0x1a IRQ_TYPE_LEVEL_LOW /* HIGH-POWER */ - 2 &UIC0 0x0c IRQ_TYPE_LEVEL_HIGH /* DMA */>; - dr_mode = "host"; - status = "disabled"; + interrupts = <0x06 IRQ_TYPE_LEVEL_HIGH>, + <0x07 IRQ_TYPE_LEVEL_HIGH>, + <0x03 IRQ_TYPE_LEVEL_HIGH>, + <0x04 IRQ_TYPE_LEVEL_HIGH>, + <0x05 IRQ_TYPE_LEVEL_HIGH>, + <0x08 IRQ_TYPE_EDGE_FALLING>, + <0x09 IRQ_TYPE_EDGE_FALLING>, + <0x0c IRQ_TYPE_EDGE_FALLING>, + <0x0d IRQ_TYPE_EDGE_FALLING>; + interrupt-names = "txeob", "rxeob", "serr", + "txde", "rxde", + "tx0coal", "tx1coal", + "rx0coal", "rx1coal"; }; POB0: opb { @@ -309,9 +267,9 @@ /* * AMCC's BSP u-boot scans for the "ns16550" * compatible, without it, u-boot wouldn't - * set the "clock-frequency" which is required. + * set the required "clock-frequency". * - * However, the hardware documentation lists: + * The hardware documentation states: * "Register compatibility with 16750 register set" */ compatible = "ns16750", "ns16550"; @@ -334,14 +292,6 @@ status = "disabled"; }; - GPIO0: gpio@ef600b00 { - compatible = "ibm,ppc4xx-gpio"; - reg = <0xef600b00 0x00000048>; - #gpio-cells = <2>; - gpio-controller; - status = "disabled"; - }; - IIC0: i2c@ef600700 { compatible = "ibm,iic-460ex", "ibm,iic"; reg = <0xef600700 0x00000014>; @@ -360,15 +310,12 @@ status = "disabled"; }; - RGMII0: emac-rgmii@ef601500 { - compatible = "ibm,rgmii-405ex", "ibm,rgmii"; - reg = <0xef601500 0x00000008>; - has-mdio; - }; - - TAH0: emac-tah@ef601350 { - compatible = "ibm,tah-460ex", "ibm,tah"; - reg = <0xef601350 0x00000030>; + GPIO0: gpio@ef600b00 { + compatible = "ibm,ppc4xx-gpio"; + reg = <0xef600b00 0x00000048>; + #gpio-cells = <2>; + gpio-controller; + status = "disabled"; }; EMAC0: ethernet@ef600c00 { @@ -379,8 +326,10 @@ #interrupt-cells = <1>; #address-cells = <0>; #size-cells = <0>; - interrupt-map = <0 &UIC2 0x10 IRQ_TYPE_LEVEL_HIGH /* Status */ - 1 &UIC2 0x14 IRQ_TYPE_LEVEL_HIGH /* Wake */>; + interrupt-map = <0 &UIC2 0x10 IRQ_TYPE_LEVEL_HIGH>, + <1 &UIC2 0x14 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "status", "wake"; + reg = <0xef600c00 0x000000c4>; local-mac-address = [000000000000]; /* Filled in by U-Boot */ mal-device = <&MAL0>; @@ -401,27 +350,108 @@ has-new-stacr-staopc; status = "disabled"; }; + + TAH0: emac-tah@ef601350 { + compatible = "ibm,tah-460ex", "ibm,tah"; + reg = <0xef601350 0x00000030>; + }; + + RGMII0: emac-rgmii@ef601500 { + compatible = "ibm,rgmii-405ex", "ibm,rgmii"; + reg = <0xef601500 0x00000008>; + has-mdio; + }; + }; + + USBOTG0: usbotg@bff80000 { + compatible = "amcc,dwc-otg"; + reg = <4 0xbff80000 0x10000>; + interrupt-parent = <&USBOTG0>; + interrupts = <0 1 2>; + #interrupt-cells = <1>; + #address-cells = <0>; + #size-cells = <0>; + interrupt-map = <0 &UIC2 0x1c IRQ_TYPE_LEVEL_HIGH>, + <1 &UIC1 0x1a IRQ_TYPE_LEVEL_LOW>, + <2 &UIC0 0x0c IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "usb-otg", "high-power", "dma"; + dr_mode = "host"; + status = "disabled"; + }; + + AHBDMA0: dma@bffd0800 { + compatible = "snps,dma-spear1340"; + reg = <4 0xbffd0800 0x400>; + interrupt-parent = <&UIC0>; + interrupts = <0x19 IRQ_TYPE_LEVEL_HIGH>; + #dma-cells = <3>; + /* use autoconfiguration for the dma setup */ + }; + + SATA0: sata@bffd1000 { + compatible = "amcc,sata-460ex"; + reg = <4 0xbffd1000 0x800>; + interrupt-parent = <&UIC0>; + interrupts = <0x1a IRQ_TYPE_LEVEL_HIGH>; + dmas = <&AHBDMA0 0 0 1>; + dma-names = "sata-dma"; + status = "disabled"; + }; + + SATA1: sata@bffd1800 { + compatible = "amcc,sata-460ex"; + reg = <4 0xbffd1800 0x800>; + interrupt-parent = <&UIC0>; + interrupts = <0x1b IRQ_TYPE_LEVEL_HIGH>; + dmas = <&AHBDMA0 1 0 2>; + dma-names = "sata-dma"; + status = "disabled"; + }; + + MSI: ppc4xx-msi@c10000000 { + compatible = "amcc,ppc4xx-msi", "ppc4xx-msi"; + reg = <0xc 0x10000000 0x100 + 0xc 0x10000000 0x100>; + sdr-base = <0x36C>; + msi-data = <0x00004440>; + msi-mask = <0x0000ffe0>; + interrupts =<0 1 2 3 4 5 6 7>; + interrupt-parent = <&MSI>; + #interrupt-cells = <1>; + #address-cells = <0>; + #size-cells = <0>; + msi-available-ranges = <0x0 0x100>; + interrupt-map = + <0 &UIC3 0x18 IRQ_TYPE_EDGE_RISING>, + <1 &UIC3 0x19 IRQ_TYPE_EDGE_RISING>, + <2 &UIC3 0x1a IRQ_TYPE_EDGE_RISING>, + <3 &UIC3 0x1b IRQ_TYPE_EDGE_RISING>, + <4 &UIC3 0x1c IRQ_TYPE_EDGE_RISING>, + <5 &UIC3 0x1d IRQ_TYPE_EDGE_RISING>, + <6 &UIC3 0x1e IRQ_TYPE_EDGE_RISING>, + <7 &UIC3 0x1f IRQ_TYPE_EDGE_RISING>; + status = "disabled"; }; PCIE0: pciex@d00000000 { - device_type = "pci"; + device_type = "pci"; /* see ppc4xx_pci_find_bridge */ #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>; compatible = "ibm,plb-pciex-apm821xx", "ibm,plb-pciex"; primary; port = <0x0>; /* port number */ - reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */ - 0x0000000c 0x08010000 0x00001000>; /* Registers */ + reg = <0x0000000d 0x00000000 0x20000000>, /* Config space access */ + <0x0000000c 0x08010000 0x00001000>; /* Registers */ dcr-reg = <0x100 0x020>; sdr-base = <0x300>; /* Outbound ranges, one memory and one IO, * later cannot be changed */ - ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 - 0x02000000 0x00000000 0x00000000 0x0000000f 0x00000000 0x00000000 0x00100000 - 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; + ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000>, + <0x02000000 0x00000000 0x00000000 0x0000000f 0x00000000 0x00000000 0x00100000>, + <0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; /* Inbound 2GB range starting at 0 */ dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; @@ -438,37 +468,11 @@ * The real slot is on idsel 0, so the swizzling is 1:1 */ interrupt-map-mask = <0x0 0x0 0x0 0x7>; - interrupt-map = < - 0x0 0x0 0x0 0x1 &UIC3 0x0c IRQ_TYPE_LEVEL_HIGH /* swizzled int A */ - 0x0 0x0 0x0 0x2 &UIC3 0x0d IRQ_TYPE_LEVEL_HIGH /* swizzled int B */ - 0x0 0x0 0x0 0x3 &UIC3 0x0e IRQ_TYPE_LEVEL_HIGH /* swizzled int C */ - 0x0 0x0 0x0 0x4 &UIC3 0x0f IRQ_TYPE_LEVEL_HIGH /* swizzled int D */>; - status = "disabled"; - }; - - MSI: ppc4xx-msi@C10000000 { - compatible = "amcc,ppc4xx-msi", "ppc4xx-msi"; - reg = < 0xC 0x10000000 0x100 - 0xC 0x10000000 0x100>; - sdr-base = <0x36C>; - msi-data = <0x00004440>; - msi-mask = <0x0000ffe0>; - interrupts =<0 1 2 3 4 5 6 7>; - interrupt-parent = <&MSI>; - #interrupt-cells = <1>; - #address-cells = <0>; - #size-cells = <0>; - msi-available-ranges = <0x0 0x100>; - interrupt-map = < - 0 &UIC3 0x18 IRQ_TYPE_EDGE_RISING - 1 &UIC3 0x19 IRQ_TYPE_EDGE_RISING - 2 &UIC3 0x1a IRQ_TYPE_EDGE_RISING - 3 &UIC3 0x1b IRQ_TYPE_EDGE_RISING - 4 &UIC3 0x1c IRQ_TYPE_EDGE_RISING - 5 &UIC3 0x1d IRQ_TYPE_EDGE_RISING - 6 &UIC3 0x1e IRQ_TYPE_EDGE_RISING - 7 &UIC3 0x1f IRQ_TYPE_EDGE_RISING - >; + interrupt-map = + <0x0 0x0 0x0 0x1 &UIC3 0x0c IRQ_TYPE_LEVEL_HIGH>, /* swizzled int A */ + <0x0 0x0 0x0 0x2 &UIC3 0x0d IRQ_TYPE_LEVEL_HIGH>, /* swizzled int B */ + <0x0 0x0 0x0 0x3 &UIC3 0x0e IRQ_TYPE_LEVEL_HIGH>, /* swizzled int C */ + <0x0 0x0 0x0 0x4 &UIC3 0x0f IRQ_TYPE_LEVEL_HIGH>; /* swizzled int D */ status = "disabled"; }; };