diff for duplicates of <20130525010102.GF4476@verge.net.au> diff --git a/a/1.txt b/N1/1.txt index a48d181..69055cd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,12 +33,12 @@ On Wed, May 22, 2013 at 07:22:59PM +0200, Guennadi Liakhovetski wrote: > > > > + bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp"; > > > > }; > > > > -> > > > memory@40000000 { +> > > > memory at 40000000 { > > > > @@ -24,8 +24,29 @@ > > > > reg = <0 0x40000000 0 0x40000000>; > > > > }; > > > > -> > > > + ape6evm_fixed_3v3: fixedregulator@0 { +> > > > + ape6evm_fixed_3v3: fixedregulator at 0 { > > > > + compatible = "regulator-fixed"; > > > > + regulator-name = "3V3"; > > > > + regulator-min-microvolt = <3300000>; @@ -50,7 +50,7 @@ On Wed, May 22, 2013 at 07:22:59PM +0200, Guennadi Liakhovetski wrote: > > > > #address-cells = <1>; > > > > #size-cells = <1>; > > > > + -> > > > + ethernet@8000000 { +> > > > + ethernet at 8000000 { > > > > + compatible = "smsc,lan9118", "smsc,lan9115"; > > > > + reg = <0x08000000 0x1000>; > > > > + interrupt-parent = <&irqc1>; @@ -81,7 +81,7 @@ On Wed, May 22, 2013 at 07:22:59PM +0200, Guennadi Liakhovetski wrote: > > > #size-cells = <1>; > > > + ranges = <0 0 0 0x80000000>; > > > -> > > ethernet@8000000 { +> > > ethernet at 8000000 { > > > compatible = "smsc,lan9118", "smsc,lan9115"; > > > > > diff --git a/a/content_digest b/N1/content_digest index 0add3a4..3a0b268 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,9 +3,9 @@ "ref\0Pine.LNX.4.64.1305171458550.31481@axis700.grange\0" "ref\020130522143204.GE32012@verge.net.au\0" "ref\0Pine.LNX.4.64.1305221911380.12715@axis700.grange\0" - "From\0Simon Horman <horms@verge.net.au>\0" - "Subject\0Re: [PATCH 05/11] ARM: shmobile: APE6EVM LAN9220 support\0" - "Date\0Sat, 25 May 2013 01:01:02 +0000\0" + "From\0horms@verge.net.au (Simon Horman)\0" + "Subject\0[PATCH 05/11] ARM: shmobile: APE6EVM LAN9220 support\0" + "Date\0Sat, 25 May 2013 10:01:02 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -44,12 +44,12 @@ "> > > > +\t\tbootargs = \"console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp\";\n" "> > > > \t};\n" "> > > > \n" - "> > > > \tmemory@40000000 {\n" + "> > > > \tmemory at 40000000 {\n" "> > > > @@ -24,8 +24,29 @@\n" "> > > > \t\treg = <0 0x40000000 0 0x40000000>;\n" "> > > > \t};\n" "> > > > \n" - "> > > > +\tape6evm_fixed_3v3: fixedregulator@0 {\n" + "> > > > +\tape6evm_fixed_3v3: fixedregulator at 0 {\n" "> > > > +\t\tcompatible = \"regulator-fixed\";\n" "> > > > +\t\tregulator-name = \"3V3\";\n" "> > > > +\t\tregulator-min-microvolt = <3300000>;\n" @@ -61,7 +61,7 @@ "> > > > \t\t#address-cells = <1>;\n" "> > > > \t\t#size-cells = <1>;\n" "> > > > +\n" - "> > > > +\t\tethernet@8000000 {\n" + "> > > > +\t\tethernet at 8000000 {\n" "> > > > +\t\t\tcompatible = \"smsc,lan9118\", \"smsc,lan9115\";\n" "> > > > +\t\t\treg = <0x08000000 0x1000>;\n" "> > > > +\t\t\tinterrupt-parent = <&irqc1>;\n" @@ -92,7 +92,7 @@ "> > > \t\t#size-cells = <1>;\n" "> > > +\t\tranges = <0 0 0 0x80000000>;\n" "> > > \n" - "> > > \t\tethernet@8000000 {\n" + "> > > \t\tethernet at 8000000 {\n" "> > > \t\t\tcompatible = \"smsc,lan9118\", \"smsc,lan9115\";\n" "> > > \n" "> > \n" @@ -122,4 +122,4 @@ "\n" Ok, it sounds like it should be fixed for v3.10. -c61027d36ccaa079729fb1254655dabfe741c866a52f9eb550a6baa731d3d397 +e8b532ca53b6424fdfeff21c96dafbca92ff3f63276781ccb09a2da2c80d7fed
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.