diff for duplicates of <52124692.4080905@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 8be4e29..a1eace6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -164,7 +164,7 @@ but it will not be a decisive factor. >>> - }; >>> - }; >>> - ->>> - macb1: ethernet at f8030000 { +>>> - macb1: ethernet@f8030000 { >>> - pinctrl-names = "default"; >>> - pinctrl-0 = <&pinctrl_macb1_rmii>; >>> }; @@ -255,7 +255,7 @@ but it will not be a decisive factor. >>> 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>; @@ -264,14 +264,14 @@ but it will not be a decisive factor. >>> - 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 @@ -295,7 +295,7 @@ but it will not be a decisive factor. >>> +/ { >>> + ahb { >>> + apb { ->>> + pinctrl at fffff400 { +>>> + pinctrl@fffff400 { >>> + macb0 { >>> + pinctrl_macb0_rmii: macb0_rmii-0 { >>> + atmel,pins = @@ -325,7 +325,7 @@ but it will not be a decisive factor. >>> + }; >>> + }; >>> + ->>> + macb0: ethernet at f802c000 { +>>> + macb0: ethernet@f802c000 { >>> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; >>> + reg = <0xf802c000 0x100>; >>> + interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; @@ -357,7 +357,7 @@ but it will not be a decisive factor. >>> +/ { >>> + ahb { >>> + apb { ->>> + pinctrl at fffff400 { +>>> + pinctrl@fffff400 { >>> + macb1 { >>> + pinctrl_macb1_rmii: macb1_rmii-0 { >>> + atmel,pins = @@ -375,7 +375,7 @@ but it will not be a decisive factor. >>> + }; >>> + }; >>> + ->>> + macb1: ethernet at f8030000 { +>>> + macb1: ethernet@f8030000 { >>> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; >>> + reg = <0xf8030000 0x100>; >>> + interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; @@ -407,7 +407,7 @@ but it will not be a decisive factor. >>> +/ { >>> + ahb { >>> + apb { ->>> + pinctrl at fffff400 { +>>> + pinctrl@fffff400 { >>> + usart3 { >>> + pinctrl_usart3: usart3-0 { >>> + atmel,pins = @@ -432,7 +432,7 @@ but it will not be a decisive factor. >>> + }; >>> + }; >>> + ->>> + 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 473fe07..f1fda55 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,20 @@ "ref\01375870466-1093-1-git-send-email-b.brezillon@overkiz.com\0" "ref\020130808140722.GA18627@ns203013.ovh.net\0" "ref\05203B7DA.8030706@overkiz.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH] ARM: at91/dt: split sam9x5 peripheral definitions\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: split sam9x5 peripheral definitions\0" "Date\0Mon, 19 Aug 2013 18:23:46 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0boris brezillon <b.brezillon@overkiz.com>" + Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + " Mike Turquette <mturquette@linaro.org>\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" "On 08/08/2013 17:23, boris brezillon :\n" @@ -173,7 +183,7 @@ ">>> -\t\t\t\t};\n" ">>> -\t\t\t};\n" ">>> -\n" - ">>> -\t\t\tmacb1: ethernet at f8030000 {\n" + ">>> -\t\t\tmacb1: ethernet@f8030000 {\n" ">>> -\t\t\t\tpinctrl-names = \"default\";\n" ">>> -\t\t\t\tpinctrl-0 = <&pinctrl_macb1_rmii>;\n" ">>> \t\t\t};\n" @@ -264,7 +274,7 @@ ">>> \t\t\t\tstatus = \"disabled\";\n" ">>> \t\t\t};\n" ">>>\n" - ">>> -\t\t\tmacb0: ethernet at f802c000 {\n" + ">>> -\t\t\tmacb0: ethernet@f802c000 {\n" ">>> -\t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" ">>> -\t\t\t\treg = <0xf802c000 0x100>;\n" ">>> -\t\t\t\tinterrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -273,14 +283,14 @@ ">>> -\t\t\t\tstatus = \"disabled\";\n" ">>> -\t\t\t};\n" ">>> -\n" - ">>> -\t\t\tmacb1: ethernet at f8030000 {\n" + ">>> -\t\t\tmacb1: ethernet@f8030000 {\n" ">>> -\t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" ">>> -\t\t\t\treg = <0xf8030000 0x100>;\n" ">>> -\t\t\t\tinterrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>;\n" ">>> -\t\t\t\tstatus = \"disabled\";\n" ">>> -\t\t\t};\n" ">>> -\n" - ">>> \t\t\ti2c0: i2c at f8010000 {\n" + ">>> \t\t\ti2c0: i2c@f8010000 {\n" ">>> \t\t\t\tcompatible = \"atmel,at91sam9x5-i2c\";\n" ">>> \t\t\t\treg = <0xf8010000 0x100>;\n" ">>> diff --git a/arch/arm/boot/dts/at91sam9x5_macb0.dtsi b/arch/arm/boot/dts/at91sam9x5_macb0.dtsi\n" @@ -304,7 +314,7 @@ ">>> +/ {\n" ">>> +\tahb {\n" ">>> +\t\tapb {\n" - ">>> +\t\t\tpinctrl at fffff400 {\n" + ">>> +\t\t\tpinctrl@fffff400 {\n" ">>> +\t\t\t\tmacb0 {\n" ">>> +\t\t\t\t\tpinctrl_macb0_rmii: macb0_rmii-0 {\n" ">>> +\t\t\t\t\t\tatmel,pins =\n" @@ -334,7 +344,7 @@ ">>> +\t\t\t\t};\n" ">>> +\t\t\t};\n" ">>> +\n" - ">>> +\t\t\tmacb0: ethernet at f802c000 {\n" + ">>> +\t\t\tmacb0: ethernet@f802c000 {\n" ">>> +\t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" ">>> +\t\t\t\treg = <0xf802c000 0x100>;\n" ">>> +\t\t\t\tinterrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -366,7 +376,7 @@ ">>> +/ {\n" ">>> +\tahb {\n" ">>> +\t\tapb {\n" - ">>> +\t\t\tpinctrl at fffff400 {\n" + ">>> +\t\t\tpinctrl@fffff400 {\n" ">>> +\t\t\t\tmacb1 {\n" ">>> +\t\t\t\t\tpinctrl_macb1_rmii: macb1_rmii-0 {\n" ">>> +\t\t\t\t\t\tatmel,pins =\n" @@ -384,7 +394,7 @@ ">>> +\t\t\t\t};\n" ">>> +\t\t\t};\n" ">>> +\n" - ">>> +\t\t\tmacb1: ethernet at f8030000 {\n" + ">>> +\t\t\tmacb1: ethernet@f8030000 {\n" ">>> +\t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" ">>> +\t\t\t\treg = <0xf8030000 0x100>;\n" ">>> +\t\t\t\tinterrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -416,7 +426,7 @@ ">>> +/ {\n" ">>> +\tahb {\n" ">>> +\t\tapb {\n" - ">>> +\t\t\tpinctrl at fffff400 {\n" + ">>> +\t\t\tpinctrl@fffff400 {\n" ">>> +\t\t\t\tusart3 {\n" ">>> +\t\t\t\t\tpinctrl_usart3: usart3-0 {\n" ">>> +\t\t\t\t\t\tatmel,pins =\n" @@ -441,7 +451,7 @@ ">>> +\t\t\t\t};\n" ">>> +\t\t\t};\n" ">>> +\n" - ">>> +\t\t\tusart3: serial at f8028000 {\n" + ">>> +\t\t\tusart3: serial@f8028000 {\n" ">>> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" ">>> +\t\t\t\treg = <0xf8028000 0x200>;\n" ">>> +\t\t\t\tinterrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;\n" @@ -462,4 +472,4 @@ "-- \n" Nicolas Ferre -637c1db72d984a0c5301d3d5de0864bb32a85aec38f6236f03ebe2039add1691 +58371738ddd6e1de74d96ebe7e4e5de1a8ef4d6992e9ad02c82768bcfff533b6
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.