linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Murali Karicheri <m-karicheri2@ti.com>
To: "Kumar, Anil" <anilkumar.v@ti.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Artem Bityutskiy <dedekind1@gmail.com>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Grant Likely <grant.likely@secretlab.ca>
Subject: Re: linux-next: manual merge of the l2-mtd tree with Linus' tree
Date: Thu, 13 Dec 2012 10:15:32 -0500	[thread overview]
Message-ID: <50C9F114.4050502@ti.com> (raw)
In-Reply-To: <F3DBB1B3EF102E4994C89758CFCA32412A304D@DBDE01.ent.ti.com>

On 12/13/2012 12:38 AM, Kumar, Anil wrote:
> On Thu, Dec 13, 2012 at 07:07:55, Stephen Rothwell wrote:
>> Hi Artem,
>>
>> Today's linux-next merge of the l2-mtd tree got a conflict in
>> Documentation/devicetree/bindings/arm/davinci/nand.txt between commit
>> fed16bba8726 ("mtd: nand: davinci: fix the binding documentation") from
>> Linus' tree and commit 192afdbfbc5c ("mtd: davinci: add support for
>> parition binding nodes") from the l2-mtd tree.
>>
>> I fixed it up (maybe- see below) and can carry the fix as necessary (no
>> action is required).
>>
>> -- 
>> Cheers,
>> Stephen Rothwell                    sfr@canb.auug.org.au
>>
>> diff --cc Documentation/devicetree/bindings/arm/davinci/nand.txt
>> index 49fc7ad,4746452..0000000
>> --- a/Documentation/devicetree/bindings/arm/davinci/nand.txt
>> +++ b/Documentation/devicetree/bindings/arm/davinci/nand.txt
>> @@@ -23,16 -23,37 +23,24 @@@ Recommended properties
>>    - ti,davinci-nand-buswidth: buswidth 8 or 16
>>    - ti,davinci-nand-use-bbt: use flash based bad block table support.
>>
>> + nand device bindings may contain additional sub-nodes describing
>> + partitions of the address space. See partition.txt for more detail.
>> +
>>   -Example (enbw_cmc board):
>>   -aemif@60000000 {
>>   -	compatible = "ti,davinci-aemif";
>>   -	#address-cells =<2>;
>>   -	#size-cells =<1>;
>>   -	reg =<0x68000000 0x80000>;
>>   -	ranges =<2 0 0x60000000 0x02000000
>>   -		  3 0 0x62000000 0x02000000
>>   -		  4 0 0x64000000 0x02000000
>>   -		  5 0 0x66000000 0x02000000
>>   -		  6 0 0x68000000 0x02000000>;
>>   -	nand@3,0 {
>>   -		compatible = "ti,davinci-nand";
>>   -		reg =<3 0x0 0x807ff
>>   -			6 0x0 0x8000>;
>>   -		#address-cells =<1>;
>>   -		#size-cells =<1>;
>>   -		ti,davinci-chipselect =<1>;
>>   -		ti,davinci-mask-ale =<0>;
>>   -		ti,davinci-mask-cle =<0>;
>>   -		ti,davinci-mask-chipsel =<0>;
>>   -		ti,davinci-ecc-mode = "hw";
>>   -		ti,davinci-ecc-bits =<4>;
>>   -		ti,davinci-nand-use-bbt;
>>   +Example(da850 EVM ):
>>   +nand_cs3@62000000 {
>>   +	compatible = "ti,davinci-nand";
>>   +	reg =<0x62000000 0x807ff
>>   +		0x68000000 0x8000>;
>>   +	ti,davinci-chipselect =<1>;
>>   +	ti,davinci-mask-ale =<0>;
>>   +	ti,davinci-mask-cle =<0>;
>>   +	ti,davinci-mask-chipsel =<0>;
>>   +	ti,davinci-ecc-mode = "hw";
>>   +	ti,davinci-ecc-bits =<4>;
>>   +	ti,davinci-nand-use-bbt;
>> +
>>   -		partition@180000 {
>>   -			label = "ubifs";
>>   -			reg =<0x180000 0x7e80000>;
>>   -		};
>> ++	partition@180000 {
>> ++		label = "ubifs";
>> ++		reg =<0x180000 0x7e80000>;
> partition@180000 is sub-node of nand_cs3@62000000.
> nand_cs3@62000000 needs to use below properties
>
> #address-cells =<1>;
> #size-cells =<1>;
>
> Without these properties DT build will give reg format Warning.
>
>> + 	};
>>    };
>>
Anul,

Could you point me to a corresponding driver commit id?

Murali

  reply	other threads:[~2012-12-13 15:15 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-13  1:37 linux-next: manual merge of the l2-mtd tree with Linus' tree Stephen Rothwell
2012-12-13  5:38 ` Kumar, Anil
2012-12-13 15:15   ` Murali Karicheri [this message]
2012-12-14 13:38     ` Kumar, Anil
  -- strict thread matches above, loose matches on Subject: below --
2013-03-19  0:19 Stephen Rothwell
2012-05-29  2:33 Stephen Rothwell
2012-05-29  2:38 ` Stephen Rothwell
2012-05-29  2:45 ` Stephen Rothwell
2012-05-29  7:42   ` David Woodhouse
2012-05-29  8:19   ` Artem Bityutskiy
2012-01-11  2:38 Stephen Rothwell
2012-01-11 11:15 ` Artem Bityutskiy
2011-12-19  2:57 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50C9F114.4050502@ti.com \
    --to=m-karicheri2@ti.com \
    --cc=anilkumar.v@ti.com \
    --cc=dedekind1@gmail.com \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).