diff for duplicates of <20160122132932.GG3608@piout.net> diff --git a/a/1.txt b/N1/1.txt index 897d96d..25a4bed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ On 22/01/2016 at 14:20:25 +0100, Nicolas Ferre wrote : > The phy IRQ and associated pinmux node is also added. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> -> Cc: stable at vger.kernel.org # 4.4+ // manual merge needed +> Cc: stable@vger.kernel.org # 4.4+ // manual merge needed Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- @@ -26,21 +26,21 @@ Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts > @@ -114,9 +114,15 @@ > -> macb0: ethernet at f8008000 { +> macb0: ethernet@f8008000 { > pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_macb0_default>; > + pinctrl-0 = <&pinctrl_macb0_default &pinctrl_macb0_phy_irq>; > phy-mode = "rmii"; > status = "okay"; > + -> + ethernet-phy at 1 { +> + ethernet-phy@1 { > + reg = <0x1>; > + interrupt-parent = <&pioA>; > + interrupts = <73 IRQ_TYPE_LEVEL_LOW>; > + }; > }; > -> pdmic at f8018000 { +> pdmic@f8018000 { > @@ -300,6 +306,10 @@ > bias-disable; > }; diff --git a/a/content_digest b/N1/content_digest index 79efe59..1739b67 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,15 @@ "ref\01453468842-16137-1-git-send-email-nicolas.ferre@atmel.com\0" - "From\0alexandre.belloni@free-electrons.com (Alexandre Belloni)\0" - "Subject\0[PATCH v2] ARM: dts: at91: sama5d2 Xplained: add phy address and IRQ for macb0\0" + "From\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" + "Subject\0Re: [PATCH v2] ARM: dts: at91: sama5d2 Xplained: add phy address and IRQ for macb0\0" "Date\0Fri, 22 Jan 2016 14:29:32 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + linux-kernel@vger.kernel.org + Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + Ludovic Desroches <ludovic.desroches@atmel.com> + Wenyou Yang <wenyou.yang@atmel.com> + Songjun Wu <songjun.wu@atmel.com> + " stable@vger.kernel.org\0" "\00:1\0" "b\0" "On 22/01/2016 at 14:20:25 +0100, Nicolas Ferre wrote :\n" @@ -16,7 +23,7 @@ "> The phy IRQ and associated pinmux node is also added.\n" "> \n" "> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n" - "> Cc: stable at vger.kernel.org # 4.4+ // manual merge needed\n" + "> Cc: stable@vger.kernel.org # 4.4+ // manual merge needed\n" "Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" "\n" "> ---\n" @@ -33,21 +40,21 @@ "> +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts\n" "> @@ -114,9 +114,15 @@\n" "> \n" - "> \t\t\tmacb0: ethernet at f8008000 {\n" + "> \t\t\tmacb0: ethernet@f8008000 {\n" "> \t\t\t\tpinctrl-names = \"default\";\n" "> -\t\t\t\tpinctrl-0 = <&pinctrl_macb0_default>;\n" "> +\t\t\t\tpinctrl-0 = <&pinctrl_macb0_default &pinctrl_macb0_phy_irq>;\n" "> \t\t\t\tphy-mode = \"rmii\";\n" "> \t\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\t\tethernet-phy at 1 {\n" + "> +\t\t\t\tethernet-phy@1 {\n" "> +\t\t\t\t\treg = <0x1>;\n" "> +\t\t\t\t\tinterrupt-parent = <&pioA>;\n" "> +\t\t\t\t\tinterrupts = <73 IRQ_TYPE_LEVEL_LOW>;\n" "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tpdmic at f8018000 {\n" + "> \t\t\tpdmic@f8018000 {\n" "> @@ -300,6 +306,10 @@\n" "> \t\t\t\t\tbias-disable;\n" "> \t\t\t\t};\n" @@ -68,4 +75,4 @@ "Embedded Linux, Kernel and Android engineering\n" http://free-electrons.com -79e67590be0486622017cdb29b5da2fae8bfdb5eed000a84346878f575670621 +78e51407b9de5ac2166c276798dbfa0381b014d942f9d083f010d3c84f913501
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.