diff for duplicates of <513664EC.2050508@ti.com> diff --git a/a/1.txt b/N1/1.txt index dcd5447..f2f658b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -86,7 +86,7 @@ index 0000000..8c638fc + +Example: + -+gpmc: gpmc@6e000000 { ++gpmc: gpmc at 6e000000 { + compatible = "ti,omap3430-gpmc", "simple-bus"; + ti,hwmods = "gpmc"; + reg = <0x6e000000 0x1000>; @@ -98,7 +98,7 @@ index 0000000..8c638fc + + ranges = <0 0 0x10000000 0x08000000>; + -+ nor@0,0 { ++ nor at 0,0 { + compatible = "cfi-flash"; + linux,mtd-name= "intel,pf48f6000m0y1be"; + #address-cells = <1>; @@ -128,19 +128,19 @@ index 0000000..8c638fc + gpmc,cycle2cycle-samecsen; + gpmc,cycle2cycle-diffcsen; + -+ partition@0 { ++ partition at 0 { + label = "bootloader-nor"; + reg = <0 0x40000>; + }; -+ partition@0x40000 { ++ partition at 0x40000 { + label = "params-nor"; + reg = <0x40000 0x40000>; + }; -+ partition@0x80000 { ++ partition at 0x80000 { + label = "kernel-nor"; + reg = <0x80000 0x200000>; + }; -+ partition@0x280000 { ++ partition at 0x280000 { + label = "filesystem-nor"; + reg = <0x240000 0x7d80000>; + }; diff --git a/a/content_digest b/N1/content_digest index 8be7a89..9121432 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,18 +4,10 @@ "ref\051360562.20309@ti.com\0" "ref\051361B46.507@mimc.co.uk\0" "ref\051362BAB.10403@ti.com\0" - "From\0Jon Hunter <jon-hunter@ti.com>\0" - "Subject\0Re: [PATCH 11/14] ARM: OMAP2+: Add device-tree support for NOR flash\0" + "From\0jon-hunter@ti.com (Jon Hunter)\0" + "Subject\0[PATCH 11/14] ARM: OMAP2+: Add device-tree support for NOR flash\0" "Date\0Tue, 5 Mar 2013 15:34:36 -0600\0" - "To\0Mark Jackson <mpfj-list@mimc.co.uk>\0" - "Cc\0Rob Herring <rob.herring@calxeda.com>" - Grant Likely <grant.likely@secretlab.ca> - Tony Lindgren <tony@atomide.com> - Benoit Cousson <b-cousson@ti.com> - device-tree <devicetree-discuss@lists.ozlabs.org> - linux-omap <linux-omap@vger.kernel.org> - linux-arm <linux-arm-kernel@lists.infradead.org> - " Daniel Mack <zonque@gmail.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" @@ -106,7 +98,7 @@ "+\n" "+Example:\n" "+\n" - "+gpmc: gpmc@6e000000 {\n" + "+gpmc: gpmc at 6e000000 {\n" "+\tcompatible = \"ti,omap3430-gpmc\", \"simple-bus\";\n" "+\tti,hwmods = \"gpmc\";\n" "+\treg = <0x6e000000 0x1000>;\n" @@ -118,7 +110,7 @@ "+\n" "+\tranges = <0 0 0x10000000 0x08000000>;\n" "+\n" - "+\tnor@0,0 {\n" + "+\tnor at 0,0 {\n" "+\t\tcompatible = \"cfi-flash\";\n" "+\t\tlinux,mtd-name= \"intel,pf48f6000m0y1be\";\n" "+\t\t#address-cells = <1>;\n" @@ -148,19 +140,19 @@ "+\t\tgpmc,cycle2cycle-samecsen;\n" "+\t\tgpmc,cycle2cycle-diffcsen;\n" "+\n" - "+\t\tpartition@0 {\n" + "+\t\tpartition at 0 {\n" "+\t\t\tlabel = \"bootloader-nor\";\n" "+\t\t\treg = <0 0x40000>;\n" "+\t\t};\n" - "+\t\tpartition@0x40000 {\n" + "+\t\tpartition at 0x40000 {\n" "+\t\t\tlabel = \"params-nor\";\n" "+\t\t\treg = <0x40000 0x40000>;\n" "+\t\t};\n" - "+\t\tpartition@0x80000 {\n" + "+\t\tpartition at 0x80000 {\n" "+\t\t\tlabel = \"kernel-nor\";\n" "+\t\t\treg = <0x80000 0x200000>;\n" "+\t\t};\n" - "+\t\tpartition@0x280000 {\n" + "+\t\tpartition at 0x280000 {\n" "+\t\t\tlabel = \"filesystem-nor\";\n" "+\t\t\treg = <0x240000 0x7d80000>;\n" "+\t\t};\n" @@ -314,4 +306,4 @@ "-- \n" 1.7.10.4 -cf62fcb6892a1df07bcb8d04fd376f3c03538d998e8fa6376c0251f410a23864 +72dd9a84f992a504c8e97f1a86eecf8380e84ec07063f11eb0b2a7b94fe59e9b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.