From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTP id 2B9AADDF3C for ; Thu, 22 Nov 2007 06:20:16 +1100 (EST) Message-Id: <0DB17B38-FDCA-4C37-940A-D60723868B26@kernel.crashing.org> From: Kumar Gala To: Scott Wood In-Reply-To: <20071121172927.GA4413@loki.buserror.net> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Mime-Version: 1.0 (Apple Message framework v915) Subject: Re: [PATCH 2/3] [POWERPC] Add docs for Freescale RapidIO device tree node Date: Wed, 21 Nov 2007 13:20:05 -0600 References: <20071121172927.GA4413@loki.buserror.net> Cc: linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Nov 21, 2007, at 11:29 AM, Scott Wood wrote: > On Tue, Nov 20, 2007 at 11:13:58PM -0600, Kumar Gala wrote: >> Required properties: >> - compatible : compatible list, contains 2 entries, >> first is >> - "fsl,sata-CHIP", where CHIP is the processor >> + "fsl,CHIP-sata", where CHIP is the processor >> (mpc8315, mpc8379, etc.) and the second is >> - "fsl,sata-pq2pro" >> + "fsl,pq2pro-sata" >> - interrupts : >> - interrupt-parent : optional, if needed for interrupt mapping >> - reg : >> @@ -2531,12 +2531,53 @@ platforms are moved over to use the >> flattened-device-tree model. >> Example: >> >> sata@19000 { >> - compatible = "fsl,mpc8315-sata", "fsl,sata-pq2pro; >> + compatible = "fsl,mpc8315-sata", "fsl,pq2pro-sata; > > I think you meant to merge these changes with the previous patch... Yeah a merge issue, I'll look into it. - k