diff for duplicates of <20130819223714.4443.95698@quantum> diff --git a/a/1.txt b/N1/1.txt index 7587415..3bf6a26 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -176,7 +176,7 @@ Mike > >>> - }; > >>> - }; > >>> - -> >>> - macb1: ethernet at f8030000 { +> >>> - macb1: ethernet@f8030000 { > >>> - pinctrl-names = "default"; > >>> - pinctrl-0 = <&pinctrl_macb1_rmii>; > >>> }; @@ -267,7 +267,7 @@ Mike > >>> status = "disabled"; > >>> }; > >>> -> >>> - macb0: ethernet at f802c000 { +> >>> - macb0: ethernet@f802c000 { > >>> - compatible = "cdns,at32ap7000-macb", "cdns,macb"; > >>> - reg = <0xf802c000 0x100>; > >>> - interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; @@ -276,14 +276,14 @@ Mike > >>> - status = "disabled"; > >>> - }; > >>> - -> >>> - macb1: ethernet at f8030000 { +> >>> - macb1: ethernet@f8030000 { > >>> - compatible = "cdns,at32ap7000-macb", "cdns,macb"; > >>> - reg = <0xf8030000 0x100>; > >>> - interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; > >>> - status = "disabled"; > >>> - }; > >>> - -> >>> i2c0: i2c at f8010000 { +> >>> i2c0: i2c@f8010000 { > >>> compatible = "atmel,at91sam9x5-i2c"; > >>> reg = <0xf8010000 0x100>; > >>> diff --git a/arch/arm/boot/dts/at91sam9x5_macb0.dtsi b/arch/arm/boot/dts/at91sam9x5_macb0.dtsi @@ -307,7 +307,7 @@ Mike > >>> +/ { > >>> + ahb { > >>> + apb { -> >>> + pinctrl at fffff400 { +> >>> + pinctrl@fffff400 { > >>> + macb0 { > >>> + pinctrl_macb0_rmii: macb0_rmii-0 { > >>> + atmel,pins = @@ -337,7 +337,7 @@ Mike > >>> + }; > >>> + }; > >>> + -> >>> + macb0: ethernet at f802c000 { +> >>> + macb0: ethernet@f802c000 { > >>> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; > >>> + reg = <0xf802c000 0x100>; > >>> + interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; @@ -369,7 +369,7 @@ Mike > >>> +/ { > >>> + ahb { > >>> + apb { -> >>> + pinctrl at fffff400 { +> >>> + pinctrl@fffff400 { > >>> + macb1 { > >>> + pinctrl_macb1_rmii: macb1_rmii-0 { > >>> + atmel,pins = @@ -387,7 +387,7 @@ Mike > >>> + }; > >>> + }; > >>> + -> >>> + macb1: ethernet at f8030000 { +> >>> + macb1: ethernet@f8030000 { > >>> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; > >>> + reg = <0xf8030000 0x100>; > >>> + interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; @@ -419,7 +419,7 @@ Mike > >>> +/ { > >>> + ahb { > >>> + apb { -> >>> + pinctrl at fffff400 { +> >>> + pinctrl@fffff400 { > >>> + usart3 { > >>> + pinctrl_usart3: usart3-0 { > >>> + atmel,pins = @@ -444,7 +444,7 @@ Mike > >>> + }; > >>> + }; > >>> + -> >>> + usart3: serial at f8028000 { +> >>> + usart3: serial@f8028000 { > >>> + compatible = "atmel,at91sam9260-usart"; > >>> + reg = <0xf8028000 0x200>; > >>> + interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>; diff --git a/a/content_digest b/N1/content_digest index f676bb2..48079c9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,20 @@ "ref\020130808140722.GA18627@ns203013.ovh.net\0" "ref\05203B7DA.8030706@overkiz.com\0" "ref\052124692.4080905@atmel.com\0" - "From\0mturquette@linaro.org (Mike Turquette)\0" - "Subject\0[PATCH] ARM: at91/dt: split sam9x5 peripheral definitions\0" + "From\0Mike Turquette <mturquette@linaro.org>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: split sam9x5 peripheral definitions\0" "Date\0Mon, 19 Aug 2013 15:37:14 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Nicolas Ferre <nicolas.ferre@atmel.com>" + boris brezillon <b.brezillon@overkiz.com> + " Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" + "Cc\0Russell King <linux@arm.linux.org.uk>" + Linus Walleij <linus.walleij@linaro.org> + Ludovic Desroches <ludovic.desroches@atmel.com> + Richard Genoud <richard.genoud@gmail.com> + Mark Brown <broonie@kernel.org> + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + " <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" "Quoting Nicolas Ferre (2013-08-19 09:23:46)\n" @@ -186,7 +196,7 @@ "> >>> - };\n" "> >>> - };\n" "> >>> -\n" - "> >>> - macb1: ethernet at f8030000 {\n" + "> >>> - macb1: ethernet@f8030000 {\n" "> >>> - pinctrl-names = \"default\";\n" "> >>> - pinctrl-0 = <&pinctrl_macb1_rmii>;\n" "> >>> };\n" @@ -277,7 +287,7 @@ "> >>> status = \"disabled\";\n" "> >>> };\n" "> >>>\n" - "> >>> - macb0: ethernet at f802c000 {\n" + "> >>> - macb0: ethernet@f802c000 {\n" "> >>> - compatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> >>> - reg = <0xf802c000 0x100>;\n" "> >>> - interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -286,14 +296,14 @@ "> >>> - status = \"disabled\";\n" "> >>> - };\n" "> >>> -\n" - "> >>> - macb1: ethernet at f8030000 {\n" + "> >>> - macb1: ethernet@f8030000 {\n" "> >>> - compatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> >>> - reg = <0xf8030000 0x100>;\n" "> >>> - interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>;\n" "> >>> - status = \"disabled\";\n" "> >>> - };\n" "> >>> -\n" - "> >>> i2c0: i2c at f8010000 {\n" + "> >>> i2c0: i2c@f8010000 {\n" "> >>> compatible = \"atmel,at91sam9x5-i2c\";\n" "> >>> reg = <0xf8010000 0x100>;\n" "> >>> diff --git a/arch/arm/boot/dts/at91sam9x5_macb0.dtsi b/arch/arm/boot/dts/at91sam9x5_macb0.dtsi\n" @@ -317,7 +327,7 @@ "> >>> +/ {\n" "> >>> + ahb {\n" "> >>> + apb {\n" - "> >>> + pinctrl at fffff400 {\n" + "> >>> + pinctrl@fffff400 {\n" "> >>> + macb0 {\n" "> >>> + pinctrl_macb0_rmii: macb0_rmii-0 {\n" "> >>> + atmel,pins =\n" @@ -347,7 +357,7 @@ "> >>> + };\n" "> >>> + };\n" "> >>> +\n" - "> >>> + macb0: ethernet at f802c000 {\n" + "> >>> + macb0: ethernet@f802c000 {\n" "> >>> + compatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> >>> + reg = <0xf802c000 0x100>;\n" "> >>> + interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -379,7 +389,7 @@ "> >>> +/ {\n" "> >>> + ahb {\n" "> >>> + apb {\n" - "> >>> + pinctrl at fffff400 {\n" + "> >>> + pinctrl@fffff400 {\n" "> >>> + macb1 {\n" "> >>> + pinctrl_macb1_rmii: macb1_rmii-0 {\n" "> >>> + atmel,pins =\n" @@ -397,7 +407,7 @@ "> >>> + };\n" "> >>> + };\n" "> >>> +\n" - "> >>> + macb1: ethernet at f8030000 {\n" + "> >>> + macb1: ethernet@f8030000 {\n" "> >>> + compatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> >>> + reg = <0xf8030000 0x100>;\n" "> >>> + interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -429,7 +439,7 @@ "> >>> +/ {\n" "> >>> + ahb {\n" "> >>> + apb {\n" - "> >>> + pinctrl at fffff400 {\n" + "> >>> + pinctrl@fffff400 {\n" "> >>> + usart3 {\n" "> >>> + pinctrl_usart3: usart3-0 {\n" "> >>> + atmel,pins =\n" @@ -454,7 +464,7 @@ "> >>> + };\n" "> >>> + };\n" "> >>> +\n" - "> >>> + usart3: serial at f8028000 {\n" + "> >>> + usart3: serial@f8028000 {\n" "> >>> + compatible = \"atmel,at91sam9260-usart\";\n" "> >>> + reg = <0xf8028000 0x200>;\n" "> >>> + interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;\n" @@ -475,4 +485,4 @@ "> -- \n" > Nicolas Ferre -aa64060c7a3c75e3c08681509545bb1ff551593d400ac74cb2453c7f8f7431cc +73e503109a9bd0e0b1bba0a0e6a2e3c157a2f6dab459801a4bf90ea31b3c2c37
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.