diff for duplicates of <b43a43a80c69ec0f51dc7ae37f0d6b50@localhost> diff --git a/a/1.txt b/N1/1.txt index 1aa17e7..77d2961 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -232,7 +232,7 @@ Boris >> >>> - }; >> >>> - }; >> >>> - ->> >>> - macb1: ethernet at f8030000 { +>> >>> - macb1: ethernet@f8030000 { >> >>> - pinctrl-names = "default"; >> >>> - pinctrl-0 = <&pinctrl_macb1_rmii>; >> >>> }; @@ -323,7 +323,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>; @@ -332,14 +332,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 @@ -363,7 +363,7 @@ Boris >> >>> +/ { >> >>> + ahb { >> >>> + apb { ->> >>> + pinctrl at fffff400 { +>> >>> + pinctrl@fffff400 { >> >>> + macb0 { >> >>> + pinctrl_macb0_rmii: macb0_rmii-0 { >> >>> + atmel,pins = @@ -393,7 +393,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>; @@ -425,7 +425,7 @@ Boris >> >>> +/ { >> >>> + ahb { >> >>> + apb { ->> >>> + pinctrl at fffff400 { +>> >>> + pinctrl@fffff400 { >> >>> + macb1 { >> >>> + pinctrl_macb1_rmii: macb1_rmii-0 { >> >>> + atmel,pins = @@ -443,7 +443,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>; @@ -475,7 +475,7 @@ Boris >> >>> +/ { >> >>> + ahb { >> >>> + apb { ->> >>> + pinctrl at fffff400 { +>> >>> + pinctrl@fffff400 { >> >>> + usart3 { >> >>> + pinctrl_usart3: usart3-0 { >> >>> + atmel,pins = @@ -500,7 +500,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 daba811..99adae5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,10 +3,20 @@ "ref\05203B7DA.8030706@overkiz.com\0" "ref\052124692.4080905@atmel.com\0" "ref\020130819223714.4443.95698@quantum\0" - "From\0b.brezillon@overkiz.com (b.brezillon at overkiz.com)\0" - "Subject\0[PATCH] ARM: at91/dt: split sam9x5 peripheral definitions\0" + "From\0<b.brezillon@overkiz.com>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: split sam9x5 peripheral definitions\0" "Date\0Tue, 20 Aug 2013 08:00:32 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Mike Turquette <mturquette@linaro.org>\0" + "Cc\0Nicolas Ferre <nicolas.ferre@atmel.com>" + Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + Russell 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" "Hello Mike,\n" @@ -243,7 +253,7 @@ ">> >>> - };\n" ">> >>> - };\n" ">> >>> -\n" - ">> >>> - macb1: ethernet at f8030000 {\n" + ">> >>> - macb1: ethernet@f8030000 {\n" ">> >>> - pinctrl-names = \"default\";\n" ">> >>> - pinctrl-0 = <&pinctrl_macb1_rmii>;\n" ">> >>> };\n" @@ -334,7 +344,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" @@ -343,14 +353,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" @@ -374,7 +384,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" @@ -404,7 +414,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" @@ -436,7 +446,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" @@ -454,7 +464,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" @@ -486,7 +496,7 @@ ">> >>> +/ {\n" ">> >>> + ahb {\n" ">> >>> + apb {\n" - ">> >>> + pinctrl at fffff400 {\n" + ">> >>> + pinctrl@fffff400 {\n" ">> >>> + usart3 {\n" ">> >>> + pinctrl_usart3: usart3-0 {\n" ">> >>> + atmel,pins =\n" @@ -511,7 +521,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" @@ -532,4 +542,4 @@ ">> --\n" >> Nicolas Ferre -87cccb03b75d84cba5cefd21b630da06dd84eff3c616345a2bc568575a56a70c +43f398254b01028a93fac401259f7b2604063fc0be840b0fadb6ace77e8c0638
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.