diff for duplicates of <20130614214115.99C94FAACE@dev.laptop.org> diff --git a/a/1.txt b/N1/1.txt index cafd754..e1c42e4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,7 +71,7 @@ index 3554fb9..0c020ff 100644 mrvl,intc-nr-irqs = <64>; - }; -- intcmux4 at d4282150 { +- intcmux4@d4282150 { - compatible = "mrvl,mmp2-mux-intc"; - interrupts = <4>; - interrupt-controller; @@ -79,7 +79,7 @@ index 3554fb9..0c020ff 100644 - reg = <0x150 0x4>, <0x168 0x4>; - reg-names = "mux status", "mux mask"; - mrvl,intc-nr-irqs = <2>; -+ intcmux4 at 150 { ++ intcmux4@150 { + compatible = "mrvl,mmp2-mux-intc"; + interrupts = <4>; + interrupt-controller; @@ -101,7 +101,7 @@ index 4e8b08c..171e6e2 100644 mrvl,intc-nr-irqs = <64>; - }; -- intcmux4: interrupt-controller at d4282150 { +- intcmux4: interrupt-controller@d4282150 { - compatible = "mrvl,mmp2-mux-intc"; - interrupts = <4>; - interrupt-controller; @@ -110,7 +110,7 @@ index 4e8b08c..171e6e2 100644 - reg-names = "mux status", "mux mask"; - mrvl,intc-nr-irqs = <2>; - }; -+ intcmux4: interrupt-controller at 150 { ++ intcmux4: interrupt-controller@150 { + compatible = "mrvl,mmp2-mux-intc"; + interrupts = <4>; + interrupt-controller; @@ -120,7 +120,7 @@ index 4e8b08c..171e6e2 100644 + mrvl,intc-nr-irqs = <2>; + }; -- intcmux5: interrupt-controller at d4282154 { +- intcmux5: interrupt-controller@d4282154 { - compatible = "mrvl,mmp2-mux-intc"; - interrupts = <5>; - interrupt-controller; @@ -130,7 +130,7 @@ index 4e8b08c..171e6e2 100644 - mrvl,intc-nr-irqs = <2>; - mrvl,clr-mfp-irq = <1>; - }; -+ intcmux5: interrupt-controller at 154 { ++ intcmux5: interrupt-controller@154 { + compatible = "mrvl,mmp2-mux-intc"; + interrupts = <5>; + interrupt-controller; @@ -141,7 +141,7 @@ index 4e8b08c..171e6e2 100644 + mrvl,clr-mfp-irq = <1>; + }; -- intcmux9: interrupt-controller at d4282180 { +- intcmux9: interrupt-controller@d4282180 { - compatible = "mrvl,mmp2-mux-intc"; - interrupts = <9>; - interrupt-controller; @@ -150,7 +150,7 @@ index 4e8b08c..171e6e2 100644 - reg-names = "mux status", "mux mask"; - mrvl,intc-nr-irqs = <3>; - }; -+ intcmux9: interrupt-controller at 180 { ++ intcmux9: interrupt-controller@180 { + compatible = "mrvl,mmp2-mux-intc"; + interrupts = <9>; + interrupt-controller; @@ -160,7 +160,7 @@ index 4e8b08c..171e6e2 100644 + mrvl,intc-nr-irqs = <3>; + }; -- intcmux17: interrupt-controller at d4282158 { +- intcmux17: interrupt-controller@d4282158 { - compatible = "mrvl,mmp2-mux-intc"; - interrupts = <17>; - interrupt-controller; @@ -169,7 +169,7 @@ index 4e8b08c..171e6e2 100644 - reg-names = "mux status", "mux mask"; - mrvl,intc-nr-irqs = <5>; - }; -+ intcmux17: interrupt-controller at 158 { ++ intcmux17: interrupt-controller@158 { + compatible = "mrvl,mmp2-mux-intc"; + interrupts = <17>; + interrupt-controller; @@ -179,7 +179,7 @@ index 4e8b08c..171e6e2 100644 + mrvl,intc-nr-irqs = <5>; + }; -- intcmux35: interrupt-controller at d428215c { +- intcmux35: interrupt-controller@d428215c { - compatible = "mrvl,mmp2-mux-intc"; - interrupts = <35>; - interrupt-controller; @@ -188,7 +188,7 @@ index 4e8b08c..171e6e2 100644 - reg-names = "mux status", "mux mask"; - mrvl,intc-nr-irqs = <15>; - }; -+ intcmux35: interrupt-controller at 15c { ++ intcmux35: interrupt-controller@15c { + compatible = "mrvl,mmp2-mux-intc"; + interrupts = <35>; + interrupt-controller; @@ -198,7 +198,7 @@ index 4e8b08c..171e6e2 100644 + mrvl,intc-nr-irqs = <15>; + }; -- intcmux51: interrupt-controller at d4282160 { +- intcmux51: interrupt-controller@d4282160 { - compatible = "mrvl,mmp2-mux-intc"; - interrupts = <51>; - interrupt-controller; @@ -207,7 +207,7 @@ index 4e8b08c..171e6e2 100644 - reg-names = "mux status", "mux mask"; - mrvl,intc-nr-irqs = <2>; - }; -+ intcmux51: interrupt-controller at 160 { ++ intcmux51: interrupt-controller@160 { + compatible = "mrvl,mmp2-mux-intc"; + interrupts = <51>; + interrupt-controller; @@ -217,7 +217,7 @@ index 4e8b08c..171e6e2 100644 + mrvl,intc-nr-irqs = <2>; + }; -- intcmux55: interrupt-controller at d4282188 { +- intcmux55: interrupt-controller@d4282188 { - compatible = "mrvl,mmp2-mux-intc"; - interrupts = <55>; - interrupt-controller; @@ -225,7 +225,7 @@ index 4e8b08c..171e6e2 100644 - reg = <0x188 0x4>, <0x184 0x4>; - reg-names = "mux status", "mux mask"; - mrvl,intc-nr-irqs = <2>; -+ intcmux55: interrupt-controller at 188 { ++ intcmux55: interrupt-controller@188 { + compatible = "mrvl,mmp2-mux-intc"; + interrupts = <55>; + interrupt-controller; diff --git a/a/content_digest b/N1/content_digest index 0585d06..df84a40 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,10 @@ - "From\0dsd@laptop.org (Daniel Drake)\0" + "From\0Daniel Drake <dsd@laptop.org>\0" "Subject\0[PATCH] ARM: mmp: irq: Improve DT layout\0" "Date\0Fri, 14 Jun 2013 17:41:15 -0400 (EDT)\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0eric.y.miao@gmail.com" + " haojian.zhuang@gmail.com\0" + "Cc\0devicetree-discuss@lists.ozlabs.org" + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "In the mmp2 device tree, the interrupt mux nodes were peers of the\n" @@ -77,7 +80,7 @@ " \t\tmrvl,intc-nr-irqs = <64>;\n" "-\t};\n" " \n" - "-\tintcmux4 at d4282150 {\n" + "-\tintcmux4@d4282150 {\n" "-\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "-\t\tinterrupts = <4>;\n" "-\t\tinterrupt-controller;\n" @@ -85,7 +88,7 @@ "-\t\treg = <0x150 0x4>, <0x168 0x4>;\n" "-\t\treg-names = \"mux status\", \"mux mask\";\n" "-\t\tmrvl,intc-nr-irqs = <2>;\n" - "+\t\tintcmux4 at 150 {\n" + "+\t\tintcmux4@150 {\n" "+\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "+\t\t\tinterrupts = <4>;\n" "+\t\t\tinterrupt-controller;\n" @@ -107,7 +110,7 @@ " \t\t\t\tmrvl,intc-nr-irqs = <64>;\n" "-\t\t\t};\n" " \n" - "-\t\t\tintcmux4: interrupt-controller at d4282150 {\n" + "-\t\t\tintcmux4: interrupt-controller@d4282150 {\n" "-\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "-\t\t\t\tinterrupts = <4>;\n" "-\t\t\t\tinterrupt-controller;\n" @@ -116,7 +119,7 @@ "-\t\t\t\treg-names = \"mux status\", \"mux mask\";\n" "-\t\t\t\tmrvl,intc-nr-irqs = <2>;\n" "-\t\t\t};\n" - "+\t\t\t\tintcmux4: interrupt-controller at 150 {\n" + "+\t\t\t\tintcmux4: interrupt-controller@150 {\n" "+\t\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "+\t\t\t\t\tinterrupts = <4>;\n" "+\t\t\t\t\tinterrupt-controller;\n" @@ -126,7 +129,7 @@ "+\t\t\t\t\tmrvl,intc-nr-irqs = <2>;\n" "+\t\t\t\t};\n" " \n" - "-\t\t\tintcmux5: interrupt-controller at d4282154 {\n" + "-\t\t\tintcmux5: interrupt-controller@d4282154 {\n" "-\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "-\t\t\t\tinterrupts = <5>;\n" "-\t\t\t\tinterrupt-controller;\n" @@ -136,7 +139,7 @@ "-\t\t\t\tmrvl,intc-nr-irqs = <2>;\n" "-\t\t\t\tmrvl,clr-mfp-irq = <1>;\n" "-\t\t\t};\n" - "+\t\t\t\tintcmux5: interrupt-controller at 154 {\n" + "+\t\t\t\tintcmux5: interrupt-controller@154 {\n" "+\t\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "+\t\t\t\t\tinterrupts = <5>;\n" "+\t\t\t\t\tinterrupt-controller;\n" @@ -147,7 +150,7 @@ "+\t\t\t\t\tmrvl,clr-mfp-irq = <1>;\n" "+\t\t\t\t};\n" " \n" - "-\t\t\tintcmux9: interrupt-controller at d4282180 {\n" + "-\t\t\tintcmux9: interrupt-controller@d4282180 {\n" "-\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "-\t\t\t\tinterrupts = <9>;\n" "-\t\t\t\tinterrupt-controller;\n" @@ -156,7 +159,7 @@ "-\t\t\t\treg-names = \"mux status\", \"mux mask\";\n" "-\t\t\t\tmrvl,intc-nr-irqs = <3>;\n" "-\t\t\t};\n" - "+\t\t\t\tintcmux9: interrupt-controller at 180 {\n" + "+\t\t\t\tintcmux9: interrupt-controller@180 {\n" "+\t\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "+\t\t\t\t\tinterrupts = <9>;\n" "+\t\t\t\t\tinterrupt-controller;\n" @@ -166,7 +169,7 @@ "+\t\t\t\t\tmrvl,intc-nr-irqs = <3>;\n" "+\t\t\t\t};\n" " \n" - "-\t\t\tintcmux17: interrupt-controller at d4282158 {\n" + "-\t\t\tintcmux17: interrupt-controller@d4282158 {\n" "-\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "-\t\t\t\tinterrupts = <17>;\n" "-\t\t\t\tinterrupt-controller;\n" @@ -175,7 +178,7 @@ "-\t\t\t\treg-names = \"mux status\", \"mux mask\";\n" "-\t\t\t\tmrvl,intc-nr-irqs = <5>;\n" "-\t\t\t};\n" - "+\t\t\t\tintcmux17: interrupt-controller at 158 {\n" + "+\t\t\t\tintcmux17: interrupt-controller@158 {\n" "+\t\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "+\t\t\t\t\tinterrupts = <17>;\n" "+\t\t\t\t\tinterrupt-controller;\n" @@ -185,7 +188,7 @@ "+\t\t\t\t\tmrvl,intc-nr-irqs = <5>;\n" "+\t\t\t\t};\n" " \n" - "-\t\t\tintcmux35: interrupt-controller at d428215c {\n" + "-\t\t\tintcmux35: interrupt-controller@d428215c {\n" "-\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "-\t\t\t\tinterrupts = <35>;\n" "-\t\t\t\tinterrupt-controller;\n" @@ -194,7 +197,7 @@ "-\t\t\t\treg-names = \"mux status\", \"mux mask\";\n" "-\t\t\t\tmrvl,intc-nr-irqs = <15>;\n" "-\t\t\t};\n" - "+\t\t\t\tintcmux35: interrupt-controller at 15c {\n" + "+\t\t\t\tintcmux35: interrupt-controller@15c {\n" "+\t\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "+\t\t\t\t\tinterrupts = <35>;\n" "+\t\t\t\t\tinterrupt-controller;\n" @@ -204,7 +207,7 @@ "+\t\t\t\t\tmrvl,intc-nr-irqs = <15>;\n" "+\t\t\t\t};\n" " \n" - "-\t\t\tintcmux51: interrupt-controller at d4282160 {\n" + "-\t\t\tintcmux51: interrupt-controller@d4282160 {\n" "-\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "-\t\t\t\tinterrupts = <51>;\n" "-\t\t\t\tinterrupt-controller;\n" @@ -213,7 +216,7 @@ "-\t\t\t\treg-names = \"mux status\", \"mux mask\";\n" "-\t\t\t\tmrvl,intc-nr-irqs = <2>;\n" "-\t\t\t};\n" - "+\t\t\t\tintcmux51: interrupt-controller at 160 {\n" + "+\t\t\t\tintcmux51: interrupt-controller@160 {\n" "+\t\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "+\t\t\t\t\tinterrupts = <51>;\n" "+\t\t\t\t\tinterrupt-controller;\n" @@ -223,7 +226,7 @@ "+\t\t\t\t\tmrvl,intc-nr-irqs = <2>;\n" "+\t\t\t\t};\n" " \n" - "-\t\t\tintcmux55: interrupt-controller at d4282188 {\n" + "-\t\t\tintcmux55: interrupt-controller@d4282188 {\n" "-\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "-\t\t\t\tinterrupts = <55>;\n" "-\t\t\t\tinterrupt-controller;\n" @@ -231,7 +234,7 @@ "-\t\t\t\treg = <0x188 0x4>, <0x184 0x4>;\n" "-\t\t\t\treg-names = \"mux status\", \"mux mask\";\n" "-\t\t\t\tmrvl,intc-nr-irqs = <2>;\n" - "+\t\t\t\tintcmux55: interrupt-controller at 188 {\n" + "+\t\t\t\tintcmux55: interrupt-controller@188 {\n" "+\t\t\t\t\tcompatible = \"mrvl,mmp2-mux-intc\";\n" "+\t\t\t\t\tinterrupts = <55>;\n" "+\t\t\t\t\tinterrupt-controller;\n" @@ -288,4 +291,4 @@ "-- \n" 1.8.1.4 -0bc8bcdb53b345ef284813f0147241b97cc221c91cc4a9678e4d93817b9e7f23 +634f4934d2a3d16ec0454b23a100f998ef7ed8951596eb89e393942968d7614c
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.