diff for duplicates of <519F62B3.8090302@elopez.com.ar> diff --git a/a/1.txt b/N1/1.txt index 3526b90..bd7cf20 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ Hi, -El 24/05/13 06:23, Maxime Ripard escribi?: +El 24/05/13 06:23, Maxime Ripard escribió: > From: Stefan Roese <sr@denx.de> > > Signed-off-by: Stefan Roese <sr@denx.de> @@ -15,18 +15,18 @@ El 24/05/13 06:23, Maxime Ripard escribi?: > @@ -27,6 +27,21 @@ > }; > -> soc at 01c20000 { -> + emac: ethernet at 01c0b000 { +> soc@01c20000 { +> + emac: ethernet@01c0b000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&emac_pins_a>; > + phy = <&phy0>; > + status = "okay"; > + }; > + -> + mdio at 01c0b080 { +> + mdio@01c0b080 { > + status = "okay"; > + -> + phy0: ethernet-phy at 0 { +> + phy0: ethernet-phy@0 { > + reg = <0>; > + }; @@ -38,10 +38,3 @@ on the node?) Cheers, Emilio --------------- next part -------------- -A non-text attachment was scrubbed... -Name: fixup-reg.patch -Type: text/x-diff -Size: 711 bytes -Desc: not available -URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130524/8a9338c8/attachment-0001.bin> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..9f0c2c3 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/x-diff; + name="fixup-reg.patch" +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; + filename="fixup-reg.patch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..dd41569 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,24 @@ +>From f8a76c66fff0700e3c87f89b8b250effc0f2b37f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio@elopez.com.ar> +Date: Fri, 17 May 2013 10:11:48 -0300 +Subject: [PATCH] fixup! ARM: cubieboard: Enable ethernet (EMAC) support in dts + +--- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +index cd69799..21f0197 100644 +--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts ++++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +@@ -38,7 +38,7 @@ + status = "okay"; + + phy0: ethernet-phy@0 { +- reg = <0>; ++ reg = <1>; + }; + }; + +-- +1.8.1.6 diff --git a/a/content_digest b/N1/content_digest index 11cfe19..d4396ab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,23 @@ "ref\01369387394-9453-1-git-send-email-maxime.ripard@free-electrons.com\0" "ref\01369387394-9453-6-git-send-email-maxime.ripard@free-electrons.com\0" - "From\0emilio@elopez.com.ar (Emilio L\303\263pez)\0" - "Subject\0[PATCHv3 5/6] ARM: cubieboard: Enable ethernet (EMAC) support in dts\0" + "From\0Emilio L\303\263pez <emilio@elopez.com.ar>\0" + "Subject\0Re: [PATCHv3 5/6] ARM: cubieboard: Enable ethernet (EMAC) support in dts\0" "Date\0Fri, 24 May 2013 09:53:07 -0300\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" + "Cc\0davem@davemloft.net" + linux-arm-kernel@lists.infradead.org + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + Stefan Roese <sr@denx.de> + Florian Fainelli <florian@openwrt.org> + kevin@allwinnertech.com + sunny@allwinnertech.com + " shuge@allwinnertech.com\0" + "\01:1\0" "b\0" "Hi,\n" "\n" - "El 24/05/13 06:23, Maxime Ripard escribi?:\n" + "El 24/05/13 06:23, Maxime Ripard escribi\303\263:\n" "> From: Stefan Roese <sr@denx.de>\n" "> \n" "> Signed-off-by: Stefan Roese <sr@denx.de>\n" @@ -23,18 +32,18 @@ "> @@ -27,6 +27,21 @@\n" "> \t};\n" "> \n" - "> \tsoc at 01c20000 {\n" - "> +\t\temac: ethernet at 01c0b000 {\n" + "> \tsoc@01c20000 {\n" + "> +\t\temac: ethernet@01c0b000 {\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&emac_pins_a>;\n" "> +\t\t\tphy = <&phy0>;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmdio at 01c0b080 {\n" + "> +\t\tmdio@01c0b080 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\tphy0: ethernet-phy at 0 {\n" + "> +\t\t\tphy0: ethernet-phy@0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t};\n" "\n" @@ -45,13 +54,33 @@ "\n" "Cheers,\n" "\n" - "Emilio\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: fixup-reg.patch\n" - "Type: text/x-diff\n" - "Size: 711 bytes\n" - "Desc: not available\n" - URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130524/8a9338c8/attachment-0001.bin> + Emilio + "\01:2\0" + "fn\0fixup-reg.patch\0" + "b\0" + ">From f8a76c66fff0700e3c87f89b8b250effc0f2b37f Mon Sep 17 00:00:00 2001\n" + "From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio@elopez.com.ar>\n" + "Date: Fri, 17 May 2013 10:11:48 -0300\n" + "Subject: [PATCH] fixup! ARM: cubieboard: Enable ethernet (EMAC) support in dts\n" + "\n" + "---\n" + " arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 2 +-\n" + " 1 file changed, 1 insertion(+), 1 deletion(-)\n" + "\n" + "diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts\n" + "index cd69799..21f0197 100644\n" + "--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts\n" + "+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts\n" + "@@ -38,7 +38,7 @@\n" + " \t\t\tstatus = \"okay\";\n" + " \n" + " \t\t\tphy0: ethernet-phy@0 {\n" + "-\t\t\t\treg = <0>;\n" + "+\t\t\t\treg = <1>;\n" + " \t\t\t};\n" + " \t\t};\n" + " \n" + "-- \n" + 1.8.1.6 -fdbdcd0fc85304461fd7981136c3faa5ff7a6f4662da2f627e292e0ada3fa067 +941e7570937fa9e6c46c585f61f90bca0eeba915f582d80d6640ab7aa2bd74ee
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.