diff for duplicates of <5203B7DA.8030706@overkiz.com> diff --git a/a/1.txt b/N1/1.txt index 84d932d..67b5547 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -146,7 +146,7 @@ Boris >> - }; >> - }; >> - ->> - macb1: ethernet at f8030000 { +>> - macb1: ethernet@f8030000 { >> - pinctrl-names = "default"; >> - pinctrl-0 = <&pinctrl_macb1_rmii>; >> }; @@ -237,7 +237,7 @@ Boris >> 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>; @@ -246,14 +246,14 @@ Boris >> - 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 @@ -277,7 +277,7 @@ Boris >> +/ { >> + ahb { >> + apb { ->> + pinctrl at fffff400 { +>> + pinctrl@fffff400 { >> + macb0 { >> + pinctrl_macb0_rmii: macb0_rmii-0 { >> + atmel,pins = @@ -307,7 +307,7 @@ Boris >> + }; >> + }; >> + ->> + macb0: ethernet at f802c000 { +>> + macb0: ethernet@f802c000 { >> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; >> + reg = <0xf802c000 0x100>; >> + interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; @@ -339,7 +339,7 @@ Boris >> +/ { >> + ahb { >> + apb { ->> + pinctrl at fffff400 { +>> + pinctrl@fffff400 { >> + macb1 { >> + pinctrl_macb1_rmii: macb1_rmii-0 { >> + atmel,pins = @@ -357,7 +357,7 @@ Boris >> + }; >> + }; >> + ->> + macb1: ethernet at f8030000 { +>> + macb1: ethernet@f8030000 { >> + compatible = "cdns,at32ap7000-macb", "cdns,macb"; >> + reg = <0xf8030000 0x100>; >> + interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; @@ -389,7 +389,7 @@ Boris >> +/ { >> + ahb { >> + apb { ->> + pinctrl at fffff400 { +>> + pinctrl@fffff400 { >> + usart3 { >> + pinctrl_usart3: usart3-0 { >> + atmel,pins = @@ -414,7 +414,7 @@ Boris >> + }; >> + }; >> + ->> + 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 cc3b3da..5aa3827 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,18 @@ "ref\01375870466-1093-1-git-send-email-b.brezillon@overkiz.com\0" "ref\020130808140722.GA18627@ns203013.ovh.net\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:23:06 +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" "Hello Jean-Christophe,\n" @@ -154,7 +163,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" @@ -245,7 +254,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" @@ -254,14 +263,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" @@ -285,7 +294,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" @@ -315,7 +324,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" @@ -347,7 +356,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" @@ -365,7 +374,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" @@ -397,7 +406,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" @@ -422,7 +431,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" @@ -437,4 +446,4 @@ ">> 1.7.9.5\n" >> -10c195cc5ec90224b552e76b14dfd713ebb390a9f39d0da4b135106ad15950c9 +7c58a134cadabe9aaa0cee59d173a162fb7a33877d7036c0be7bdb5c13e44ee8
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.