linux-kernel - RE: linux-next: manual merge of the l2-mtd tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 13 Dec 2012 05:38:39 +0000
From:	"Kumar, Anil" <anilkumar.v@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Artem Bityutskiy <dedekind1@...il.com>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Grant Likely <grant.likely@...retlab.ca>,
	"Karicheri, Muralidharan" <m-karicheri2@...com>
Subject: RE: linux-next: manual merge of the l2-mtd tree with Linus' tree

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@...b.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@...00000 {
>  -	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@...00000 {
>  +	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@...000 {
>  -			label = "ubifs";
>  -			reg = <0x180000 0x7e80000>;
>  -		};
> ++	partition@...000 {
> ++		label = "ubifs";
> ++		reg = <0x180000 0x7e80000>;

partition@...000 is sub-node of nand_cs3@...00000.
nand_cs3@...00000 needs to use below properties 

#address-cells = <1>;
#size-cells = <1>;

Without these properties DT build will give reg format Warning. 

> + 	};
>   };
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/