diff for duplicates of <5203BECC.6090407@overkiz.com> diff --git a/a/1.txt b/N1/1.txt index c11ff8c..d02a8de 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -167,7 +167,7 @@ sam9m10g45ek is not part of the sam9x5 family >>> - }; >>> - }; >>> - ->>> - macb1: ethernet at f8030000 { +>>> - macb1: ethernet@f8030000 { >>> - pinctrl-names = "default"; >>> - pinctrl-0 = <&pinctrl_macb1_rmii>; >>> }; @@ -279,7 +279,7 @@ sam9m10g45ek is not part of the sam9x5 family >>> @@ -605,22 +554,6 @@ >>> 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>; @@ -288,14 +288,14 @@ sam9m10g45ek is not part of the sam9x5 family >>> - 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 @@ -321,7 +321,7 @@ sam9m10g45ek is not part of the sam9x5 family >>> +/ { >>> + ahb { >>> + apb { ->>> + pinctrl at fffff400 { +>>> + pinctrl@fffff400 { >>> + macb0 { >>> + pinctrl_macb0_rmii: macb0_rmii-0 { >>> + atmel,pins = @@ -369,7 +369,7 @@ sam9m10g45ek is not part of the sam9x5 family >>> + }; >>> + }; >>> + ->>> + macb0: ethernet at f802c000 { +>>> + macb0: ethernet@f802c000 { >>> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; >>> + reg = <0xf802c000 0x100>; >>> + interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; @@ -403,7 +403,7 @@ sam9m10g45ek is not part of the sam9x5 family >>> +/ { >>> + ahb { >>> + apb { ->>> + pinctrl at fffff400 { +>>> + pinctrl@fffff400 { >>> + macb1 { >>> + pinctrl_macb1_rmii: macb1_rmii-0 { >>> + atmel,pins = @@ -431,7 +431,7 @@ sam9m10g45ek is not part of the sam9x5 family >>> + }; >>> + }; >>> + ->>> + macb1: ethernet at f8030000 { +>>> + macb1: ethernet@f8030000 { >>> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; >>> + reg = <0xf8030000 0x100>; >>> + interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; @@ -465,7 +465,7 @@ sam9m10g45ek is not part of the sam9x5 family >>> +/ { >>> + ahb { >>> + apb { ->>> + pinctrl at fffff400 { +>>> + pinctrl@fffff400 { >>> + usart3 { >>> + pinctrl_usart3: usart3-0 { >>> + atmel,pins = @@ -495,7 +495,7 @@ sam9m10g45ek is not part of the sam9x5 family >>> + }; >>> + }; >>> + ->>> + 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 ccd3189..1397ca3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,19 @@ "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\0b.brezillon@overkiz.com (boris brezillon)\0" - "Subject\0[PATCH] ARM: at91/dt: split sam9x5 peripheral definitions\0" + "From\0boris brezillon <b.brezillon@overkiz.com>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: split sam9x5 peripheral definitions\0" "Date\0Thu, 08 Aug 2013 17:52:44 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" + "Cc\0Russell King <linux@arm.linux.org.uk>" + Nicolas Ferre <nicolas.ferre@atmel.com> + 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 wrote:\n" @@ -176,7 +185,7 @@ ">>> - };\n" ">>> - };\n" ">>> -\n" - ">>> - macb1: ethernet at f8030000 {\n" + ">>> - macb1: ethernet@f8030000 {\n" ">>> - pinctrl-names = \"default\";\n" ">>> - pinctrl-0 = <&pinctrl_macb1_rmii>;\n" ">>> };\n" @@ -288,7 +297,7 @@ ">>> @@ -605,22 +554,6 @@\n" ">>> status = \"disabled\";\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" @@ -297,14 +306,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 \n" @@ -330,7 +339,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" @@ -378,7 +387,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" @@ -412,7 +421,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" @@ -440,7 +449,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" @@ -474,7 +483,7 @@ ">>> +/ {\n" ">>> + ahb {\n" ">>> + apb {\n" - ">>> + pinctrl at fffff400 {\n" + ">>> + pinctrl@fffff400 {\n" ">>> + usart3 {\n" ">>> + pinctrl_usart3: usart3-0 {\n" ">>> + atmel,pins =\n" @@ -504,7 +513,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" @@ -520,4 +529,4 @@ ">>>\n" > -143e851bcd33af88165ee4d7157d1c979daf11a7211d6b8626d24690e11cb834 +d27e936ea50a46fe4715c4a727a8fc9eb067a81eb249cd320eef9e4197b42c0d
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.