From patchwork Wed Jul 18 10:13:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 1209851 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 3810CDFFFD for ; Wed, 18 Jul 2012 10:17:02 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SrRGI-0001qP-Rw; Wed, 18 Jul 2012 10:13:42 +0000 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SrRGD-0001qB-Pe for linux-arm-kernel@lists.infradead.org; Wed, 18 Jul 2012 10:13:39 +0000 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id BC4BAF0413; Wed, 18 Jul 2012 12:13:36 +0200 (CEST) Date: Wed, 18 Jul 2012 12:13:16 +0200 From: Pavel Machek To: Thomas Petazzoni Subject: Re: [RFC PATCHv3 2/2] ARM: socfpga: Add DTS bindings for Altera's SOCFPGA Message-ID: <20120718101316.GB7607@elf.ucw.cz> References: <1342572656-5205-1-git-send-email-dinguyen@altera.com> <1342572656-5205-3-git-send-email-dinguyen@altera.com> <20120718091617.572070c2@skate> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120718091617.572070c2@skate> X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [195.113.26.193 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux@arm.linux.org.uk, wd@denx.de, arnd@arndb.de, rob.herring@calxeda.com, cytan@altera.com, dinguyen@altera.com, dinh.linux@gmail.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi! > > + soc { > > + amba { > > + compatible = "arm,amba-bus"; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges; > > + > > + pdma: pdma@ffe01000 { > > + compatible = "arm,pl330", "arm,primecell"; > > + reg = <0xffe01000 0x1000>; > > + interrupts = <0 180 4>; > > + }; > > + }; > > + > > + apb_periphs { > > + compatible = "simple-bus"; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges; > > + > > + gmac0: stmmac@ff700000 { > > + compatible = "st,spear600-gmac"; > > + reg = <0xff700000 0x2000>; > > + interrupts = <0 115 4>; > > + interrupt-names = "macirq"; > > + mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ > > + phy-mode = "gmii"; > > + }; > > + }; > > Are the pdma and gmac0 really specific to the cyclone board? Aren't > they similar to the uarts and timers in that they are part of the SoC > itself? I guess they are not. I'm not dts expert, but would something like this be suitable? It boots :-). Pavel diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 903d4bb..ee13a3e 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -115,5 +115,27 @@ reg-shift = <2>; reg-io-width = <4>; }; + + gmac0: stmmac@ff700000 { + compatible = "st,spear600-gmac"; + reg = <0xff700000 0x2000>; + interrupts = <0 115 4>; + interrupt-names = "macirq"; + mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ + phy-mode = "gmii"; + }; + + amba { + compatible = "arm,amba-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + pdma: pdma@ffe01000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0xffe01000 0x1000>; + interrupts = <0 180 4>; + }; + }; }; }; diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dts b/arch/arm/boot/dts/socfpga_cyclone5.dts index 3433ee3..683d035 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5.dts @@ -37,35 +37,4 @@ device_type = "memory"; reg = <0x0 0x10000000>; /* 256MB */ }; - - soc { - amba { - compatible = "arm,amba-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - - pdma: pdma@ffe01000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0xffe01000 0x1000>; - interrupts = <0 180 4>; - }; - }; - - apb_periphs { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - - gmac0: stmmac@ff700000 { - compatible = "st,spear600-gmac"; - reg = <0xff700000 0x2000>; - interrupts = <0 115 4>; - interrupt-names = "macirq"; - mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ - phy-mode = "gmii"; - }; - }; - }; };