commit 863ead9491e25236ca5747289ae573cbc1bb7005
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 11 11:05:43 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 11 11:05:43 2012 -0700
tree 987e96f966371eaa8f19c6187aca11003eab8540
parent 7ef4bd6016f693973b35da70b7bb7a85da6f1463
parent 152eff18c93c014cd8885fed38f0e6eeb89032ee

Merge "Documentation: arm/dt: corrections in msm_qpic_nand.txt" into msm-3.4

Documentation/devicetree/bindings/mtd/msm_qpic_nand.txt

diff --git a/Documentation/devicetree/bindings/mtd/msm_qpic_nand.txt b/Documentation/devicetree/bindings/mtd/msm_qpic_nand.txt
index bddbbae..8cef7f0 100644
--- a/Documentation/devicetree/bindings/mtd/msm_qpic_nand.txt
+++ b/Documentation/devicetree/bindings/mtd/msm_qpic_nand.txt
@@ -38,14 +38,15 @@
 	       #size-cells = <1>;
                partition@0 {
                        label = "boot";
-                       reg = <0x00000000 0x1000>;
+                       reg = <0x0 0x1000>;
+		       read-only;
                };
-               partition@00020000 {
+               partition@20000 {
                        label = "userdata";
-                       reg = <0x00020000 0x1000>;
+                       reg = <0x20000 0x1000>;
                };
-               partition@00040000 {
+               partition@40000 {
                        label = "system";
-                       reg = <0x00040000 0x1000>;
+                       reg = <0x40000 0x1000>;
                };
        };