diff for duplicates of <531EE0D5.6030906@st.com> diff --git a/a/1.txt b/N1/1.txt index 74fa013..14d0835 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,7 +38,7 @@ On 03/10/2014 01:28 PM, Lee Jones wrote: > stable/constant of course. I prefer removing this ML. -The right one is kernel at stlinux.com as specified in the MAINTAINERS file. +The right one is kernel@stlinux.com as specified in the MAINTAINERS file. ST's DTS files are being added to MAINTAINERS file with this patch from Srini: http://marc.info/?l=linux-arm-kernel&m=139384666716614&w=2 @@ -48,7 +48,7 @@ Srini: http://marc.info/?l=linux-arm-kernel&m=139384666716614&w=2 <snip> ->> + PIO1: gpio at 09611000 { +>> + PIO1: gpio@09611000 { >> + gpio-controller; >> + #gpio-cells = <1>; >> + interrupt-controller; @@ -182,31 +182,31 @@ Fixed. >> + cpus { >> + #address-cells = <1>; >> + #size-cells = <0>; ->> + cpu at 0 { +>> + cpu@0 { >> + device_type = "cpu"; >> + compatible = "arm,cortex-a9"; >> + reg = <0>; >> + }; ->> + cpu at 1 { +>> + cpu@1 { >> + device_type = "cpu"; >> + compatible = "arm,cortex-a9"; >> + reg = <1>; >> + }; >> + }; >> + ->> + intc: interrupt-controller at 08761000 { +>> + intc: interrupt-controller@08761000 { >> + compatible = "arm,cortex-a9-gic"; >> + #interrupt-cells = <3>; >> + interrupt-controller; >> + reg = <0x08761000 0x1000>, <0x08760100 0x100>; >> + }; >> + ->> + scu at 08760000 { +>> + scu@08760000 { >> + compatible = "arm,cortex-a9-scu"; >> + reg = <0x08760000 0x1000>; >> + }; >> + ->> + timer at 08760200 { +>> + timer@08760200 { >> + interrupt-parent = <&intc>; >> + compatible = "arm,cortex-a9-global-timer"; >> + reg = <0x08760200 0x100>; @@ -230,7 +230,7 @@ Fixed. >> + ranges; >> + compatible = "simple-bus"; >> + ->> + syscfg_sbc:sbc-syscfg at 9620000{ +>> + syscfg_sbc:sbc-syscfg@9620000{ > > Space after colon and another after the address. > @@ -241,7 +241,7 @@ Fixed here and evrywhere in the file. <snip> ->> + serial at 9830000{ +>> + serial@9830000{ >> + compatible = "st,asc"; >> + status = "disabled"; > @@ -257,7 +257,7 @@ Fixed here and evrywhere in the file. >> + }; > > Like this: -> serial at 9830000{ +> serial@9830000{ > compatible = "st,asc"; > reg = <0x9830000 0x2c>; > interrupts = <GIC_SPI 122 IRQ_TYPE_NONE>; diff --git a/a/content_digest b/N1/content_digest index 6811cd1..235317f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,26 @@ "ref\01394203251-25361-1-git-send-email-maxime.coquelin@st.com\0" "ref\01394203251-25361-5-git-send-email-maxime.coquelin@st.com\0" "ref\020140310122830.GT14976@lee--X1\0" - "From\0maxime.coquelin@st.com (Maxime Coquelin)\0" - "Subject\0[PATCH v3 4/5] ARM: dts: Add STiH407 SoC support\0" + "From\0Maxime Coquelin <maxime.coquelin@st.com>\0" + "Subject\0Re: [PATCH v3 4/5] ARM: dts: Add STiH407 SoC support\0" "Date\0Tue, 11 Mar 2014 11:09:25 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Lee Jones <lee.jones@linaro.org>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Russell King <linux@arm.linux.org.uk> + kernel@stlinux.com + Pawel Moll <pawel.moll@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Linus Walleij <linus.walleij@linaro.org> + Srinivas Kandagatla <srinivas.kandagatla@st.com> + linux-doc@vger.kernel.org + linux-kernel@vger.kernel.org + Stuart Menefy <stuart.menefy@st.com> + Rob Herring <robh+dt@kernel.org> + Rob Landley <rob@landley.net> + Kumar Gala <galak@codeaurora.org> + Giuseppe Cavallaro <peppe.cavallaro@st.com> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" @@ -47,7 +63,7 @@ "> stable/constant of course.\n" "\n" "I prefer removing this ML.\n" - "The right one is kernel at stlinux.com as specified in the MAINTAINERS file.\n" + "The right one is kernel@stlinux.com as specified in the MAINTAINERS file.\n" "\n" "ST's DTS files are being added to MAINTAINERS file with this patch from \n" "Srini: http://marc.info/?l=linux-arm-kernel&m=139384666716614&w=2\n" @@ -57,7 +73,7 @@ "\n" "<snip>\n" "\n" - ">> +\t\t\tPIO1: gpio at 09611000 {\n" + ">> +\t\t\tPIO1: gpio@09611000 {\n" ">> +\t\t\t\tgpio-controller;\n" ">> +\t\t\t\t#gpio-cells = <1>;\n" ">> +\t\t\t\tinterrupt-controller;\n" @@ -191,31 +207,31 @@ ">> +\tcpus {\n" ">> +\t\t#address-cells = <1>;\n" ">> +\t\t#size-cells = <0>;\n" - ">> +\t\tcpu at 0 {\n" + ">> +\t\tcpu@0 {\n" ">> +\t\t\tdevice_type = \"cpu\";\n" ">> +\t\t\tcompatible = \"arm,cortex-a9\";\n" ">> +\t\t\treg = <0>;\n" ">> +\t\t};\n" - ">> +\t\tcpu at 1 {\n" + ">> +\t\tcpu@1 {\n" ">> +\t\t\tdevice_type = \"cpu\";\n" ">> +\t\t\tcompatible = \"arm,cortex-a9\";\n" ">> +\t\t\treg = <1>;\n" ">> +\t\t};\n" ">> +\t};\n" ">> +\n" - ">> +\tintc: interrupt-controller at 08761000 {\n" + ">> +\tintc: interrupt-controller@08761000 {\n" ">> +\t\tcompatible = \"arm,cortex-a9-gic\";\n" ">> +\t\t#interrupt-cells = <3>;\n" ">> +\t\tinterrupt-controller;\n" ">> +\t\treg = <0x08761000 0x1000>, <0x08760100 0x100>;\n" ">> +\t};\n" ">> +\n" - ">> +\tscu at 08760000 {\n" + ">> +\tscu@08760000 {\n" ">> +\t\tcompatible = \"arm,cortex-a9-scu\";\n" ">> +\t\treg = <0x08760000 0x1000>;\n" ">> +\t};\n" ">> +\n" - ">> +\ttimer at 08760200 {\n" + ">> +\ttimer@08760200 {\n" ">> +\t\tinterrupt-parent = <&intc>;\n" ">> +\t\tcompatible = \"arm,cortex-a9-global-timer\";\n" ">> +\t\treg = <0x08760200 0x100>;\n" @@ -239,7 +255,7 @@ ">> +\t\tranges;\n" ">> +\t\tcompatible = \"simple-bus\";\n" ">> +\n" - ">> +\t\tsyscfg_sbc:sbc-syscfg at 9620000{\n" + ">> +\t\tsyscfg_sbc:sbc-syscfg@9620000{\n" ">\n" "> Space after colon and another after the address.\n" ">\n" @@ -250,7 +266,7 @@ "\n" "<snip>\n" "\n" - ">> +\t\tserial at 9830000{\n" + ">> +\t\tserial@9830000{\n" ">> +\t\t\tcompatible = \"st,asc\";\n" ">> +\t\t\tstatus = \"disabled\";\n" ">\n" @@ -266,7 +282,7 @@ ">> +\t\t};\n" ">\n" "> Like this:\n" - "> \tserial at 9830000{\n" + "> \tserial@9830000{\n" "> \t\tcompatible = \"st,asc\";\n" "> \t\treg = <0x9830000 0x2c>;\n" "> \t\tinterrupts = <GIC_SPI 122 IRQ_TYPE_NONE>;\n" @@ -299,4 +315,4 @@ "Maxime\n" > -40c9b8b194498d6a254073a6b0ed20b6152f4422eb1377cbefdb63a76b90f6b0 +cd5d010a855037d2a0a6dee5195765e0437462cd0cf7c92b11332073b277c171
diff --git a/a/1.txt b/N2/1.txt index 74fa013..14d0835 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -38,7 +38,7 @@ On 03/10/2014 01:28 PM, Lee Jones wrote: > stable/constant of course. I prefer removing this ML. -The right one is kernel at stlinux.com as specified in the MAINTAINERS file. +The right one is kernel@stlinux.com as specified in the MAINTAINERS file. ST's DTS files are being added to MAINTAINERS file with this patch from Srini: http://marc.info/?l=linux-arm-kernel&m=139384666716614&w=2 @@ -48,7 +48,7 @@ Srini: http://marc.info/?l=linux-arm-kernel&m=139384666716614&w=2 <snip> ->> + PIO1: gpio at 09611000 { +>> + PIO1: gpio@09611000 { >> + gpio-controller; >> + #gpio-cells = <1>; >> + interrupt-controller; @@ -182,31 +182,31 @@ Fixed. >> + cpus { >> + #address-cells = <1>; >> + #size-cells = <0>; ->> + cpu at 0 { +>> + cpu@0 { >> + device_type = "cpu"; >> + compatible = "arm,cortex-a9"; >> + reg = <0>; >> + }; ->> + cpu at 1 { +>> + cpu@1 { >> + device_type = "cpu"; >> + compatible = "arm,cortex-a9"; >> + reg = <1>; >> + }; >> + }; >> + ->> + intc: interrupt-controller at 08761000 { +>> + intc: interrupt-controller@08761000 { >> + compatible = "arm,cortex-a9-gic"; >> + #interrupt-cells = <3>; >> + interrupt-controller; >> + reg = <0x08761000 0x1000>, <0x08760100 0x100>; >> + }; >> + ->> + scu at 08760000 { +>> + scu@08760000 { >> + compatible = "arm,cortex-a9-scu"; >> + reg = <0x08760000 0x1000>; >> + }; >> + ->> + timer at 08760200 { +>> + timer@08760200 { >> + interrupt-parent = <&intc>; >> + compatible = "arm,cortex-a9-global-timer"; >> + reg = <0x08760200 0x100>; @@ -230,7 +230,7 @@ Fixed. >> + ranges; >> + compatible = "simple-bus"; >> + ->> + syscfg_sbc:sbc-syscfg at 9620000{ +>> + syscfg_sbc:sbc-syscfg@9620000{ > > Space after colon and another after the address. > @@ -241,7 +241,7 @@ Fixed here and evrywhere in the file. <snip> ->> + serial at 9830000{ +>> + serial@9830000{ >> + compatible = "st,asc"; >> + status = "disabled"; > @@ -257,7 +257,7 @@ Fixed here and evrywhere in the file. >> + }; > > Like this: -> serial at 9830000{ +> serial@9830000{ > compatible = "st,asc"; > reg = <0x9830000 0x2c>; > interrupts = <GIC_SPI 122 IRQ_TYPE_NONE>; diff --git a/a/content_digest b/N2/content_digest index 6811cd1..b407dee 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,26 @@ "ref\01394203251-25361-1-git-send-email-maxime.coquelin@st.com\0" "ref\01394203251-25361-5-git-send-email-maxime.coquelin@st.com\0" "ref\020140310122830.GT14976@lee--X1\0" - "From\0maxime.coquelin@st.com (Maxime Coquelin)\0" - "Subject\0[PATCH v3 4/5] ARM: dts: Add STiH407 SoC support\0" + "From\0Maxime Coquelin <maxime.coquelin@st.com>\0" + "Subject\0Re: [PATCH v3 4/5] ARM: dts: Add STiH407 SoC support\0" "Date\0Tue, 11 Mar 2014 11:09:25 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Lee Jones <lee.jones@linaro.org>\0" + "Cc\0Rob Landley <rob@landley.net>" + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Russell King <linux@arm.linux.org.uk> + Srinivas Kandagatla <srinivas.kandagatla@st.com> + Stuart Menefy <stuart.menefy@st.com> + Linus Walleij <linus.walleij@linaro.org> + Giuseppe Cavallaro <peppe.cavallaro@st.com> + <linux-doc@vger.kernel.org> + <linux-kernel@vger.kernel.org> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <kernel@stlinux.com>\0" "\00:1\0" "b\0" "\n" @@ -47,7 +63,7 @@ "> stable/constant of course.\n" "\n" "I prefer removing this ML.\n" - "The right one is kernel at stlinux.com as specified in the MAINTAINERS file.\n" + "The right one is kernel@stlinux.com as specified in the MAINTAINERS file.\n" "\n" "ST's DTS files are being added to MAINTAINERS file with this patch from \n" "Srini: http://marc.info/?l=linux-arm-kernel&m=139384666716614&w=2\n" @@ -57,7 +73,7 @@ "\n" "<snip>\n" "\n" - ">> +\t\t\tPIO1: gpio at 09611000 {\n" + ">> +\t\t\tPIO1: gpio@09611000 {\n" ">> +\t\t\t\tgpio-controller;\n" ">> +\t\t\t\t#gpio-cells = <1>;\n" ">> +\t\t\t\tinterrupt-controller;\n" @@ -191,31 +207,31 @@ ">> +\tcpus {\n" ">> +\t\t#address-cells = <1>;\n" ">> +\t\t#size-cells = <0>;\n" - ">> +\t\tcpu at 0 {\n" + ">> +\t\tcpu@0 {\n" ">> +\t\t\tdevice_type = \"cpu\";\n" ">> +\t\t\tcompatible = \"arm,cortex-a9\";\n" ">> +\t\t\treg = <0>;\n" ">> +\t\t};\n" - ">> +\t\tcpu at 1 {\n" + ">> +\t\tcpu@1 {\n" ">> +\t\t\tdevice_type = \"cpu\";\n" ">> +\t\t\tcompatible = \"arm,cortex-a9\";\n" ">> +\t\t\treg = <1>;\n" ">> +\t\t};\n" ">> +\t};\n" ">> +\n" - ">> +\tintc: interrupt-controller at 08761000 {\n" + ">> +\tintc: interrupt-controller@08761000 {\n" ">> +\t\tcompatible = \"arm,cortex-a9-gic\";\n" ">> +\t\t#interrupt-cells = <3>;\n" ">> +\t\tinterrupt-controller;\n" ">> +\t\treg = <0x08761000 0x1000>, <0x08760100 0x100>;\n" ">> +\t};\n" ">> +\n" - ">> +\tscu at 08760000 {\n" + ">> +\tscu@08760000 {\n" ">> +\t\tcompatible = \"arm,cortex-a9-scu\";\n" ">> +\t\treg = <0x08760000 0x1000>;\n" ">> +\t};\n" ">> +\n" - ">> +\ttimer at 08760200 {\n" + ">> +\ttimer@08760200 {\n" ">> +\t\tinterrupt-parent = <&intc>;\n" ">> +\t\tcompatible = \"arm,cortex-a9-global-timer\";\n" ">> +\t\treg = <0x08760200 0x100>;\n" @@ -239,7 +255,7 @@ ">> +\t\tranges;\n" ">> +\t\tcompatible = \"simple-bus\";\n" ">> +\n" - ">> +\t\tsyscfg_sbc:sbc-syscfg at 9620000{\n" + ">> +\t\tsyscfg_sbc:sbc-syscfg@9620000{\n" ">\n" "> Space after colon and another after the address.\n" ">\n" @@ -250,7 +266,7 @@ "\n" "<snip>\n" "\n" - ">> +\t\tserial at 9830000{\n" + ">> +\t\tserial@9830000{\n" ">> +\t\t\tcompatible = \"st,asc\";\n" ">> +\t\t\tstatus = \"disabled\";\n" ">\n" @@ -266,7 +282,7 @@ ">> +\t\t};\n" ">\n" "> Like this:\n" - "> \tserial at 9830000{\n" + "> \tserial@9830000{\n" "> \t\tcompatible = \"st,asc\";\n" "> \t\treg = <0x9830000 0x2c>;\n" "> \t\tinterrupts = <GIC_SPI 122 IRQ_TYPE_NONE>;\n" @@ -299,4 +315,4 @@ "Maxime\n" > -40c9b8b194498d6a254073a6b0ed20b6152f4422eb1377cbefdb63a76b90f6b0 +1b61dca49585136f7bb9ca718122f58dc0e44e00178aa4f2c18153cd6c145d1d
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.