diff for duplicates of <20120519061129.BEE9D3E046E@localhost> diff --git a/a/1.txt b/N1/1.txt index 825130e..02e32b2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,28 +10,28 @@ On Wed, 2 May 2012 10:57:11 -0700, Olof Johansson <olof@lixom.net> wrote: > > > > Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> > > --- -> >  arch/arm/boot/dts/exynos5250-smdk5250.dts |  11 ++++++ -> >  arch/arm/boot/dts/exynos5250.dtsi     |  55 +++++++++++++++++++++++++++++ -> >  2 files changed, 66 insertions(+), 0 deletions(-) +> > ??arch/arm/boot/dts/exynos5250-smdk5250.dts | ?? 11 ++++++ +> > ??arch/arm/boot/dts/exynos5250.dtsi ?? ?? ?? ?? | ?? 55 +++++++++++++++++++++++++++++ +> > ??2 files changed, 66 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts > > index bcc4b89..dbc4bdb 100644 > > --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts > > +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts > > @@ -24,6 +24,17 @@ -> >         bootargs = "root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200"; -> >     }; +> > ?? ?? ?? ?? ?? ?? ?? ??bootargs = "root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200"; +> > ?? ?? ?? ??}; > > -> > +    lan9215@0x05000000 { -> > +        compatible = "smsc,lan9215", "smsc,lan9115"; -> > +        reg = <0x05000000 0x20000>; -> > +        interrupts = <5 0>; -> > +        interrupt-parent = <&wakeup_eint>; -> > +        phy-mode = "mii"; -> > +        smsc,irq-push-pull; -> > +        smsc,force-internal-phy; -> > +        local-mac-address = [00 80 00 23 45 67]; -> > +    }; +> > + ?? ?? ?? lan9215 at 0x05000000 { +> > + ?? ?? ?? ?? ?? ?? ?? compatible = "smsc,lan9215", "smsc,lan9115"; +> > + ?? ?? ?? ?? ?? ?? ?? reg = <0x05000000 0x20000>; +> > + ?? ?? ?? ?? ?? ?? ?? interrupts = <5 0>; +> > + ?? ?? ?? ?? ?? ?? ?? interrupt-parent = <&wakeup_eint>; +> > + ?? ?? ?? ?? ?? ?? ?? phy-mode = "mii"; +> > + ?? ?? ?? ?? ?? ?? ?? smsc,irq-push-pull; +> > + ?? ?? ?? ?? ?? ?? ?? smsc,force-internal-phy; +> > + ?? ?? ?? ?? ?? ?? ?? local-mac-address = [00 80 00 23 45 67]; +> > + ?? ?? ?? }; > > + > > since the 911x sits on a chipselect bus, you should instead add that @@ -51,7 +51,7 @@ On Wed, 2 May 2012 10:57:11 -0700, Olof Johansson <olof@lixom.net> wrote: > and in the dts: > > sromc-bus { -> lan9215@1,0 { +> lan9215 at 1,0 { > compatible = "smsc,lan9215", "smsc,lan9115"; > reg = <1 0 0x20000>; > interrupts = <5 0>; diff --git a/a/content_digest b/N1/content_digest index 75f6a8b..26b045f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,10 @@ "ref\01335813270-13083-1-git-send-email-thomas.abraham@linaro.org\0" "ref\01335813270-13083-20-git-send-email-thomas.abraham@linaro.org\0" "ref\0CAOesGMhxn6L+Pcp-v2v6z7srGd=8kGwqff7Tt6ok8pHMVXp3ZQ@mail.gmail.com\0" - "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0Re: [PATCH 19/20] ARM: Exynos5: Add combiner, wakeup interrupt controller and ethernet nodes\0" + "From\0grant.likely@secretlab.ca (Grant Likely)\0" + "Subject\0[PATCH 19/20] ARM: Exynos5: Add combiner, wakeup interrupt controller and ethernet nodes\0" "Date\0Sat, 19 May 2012 00:11:29 -0600\0" - "To\0Olof Johansson <olof@lixom.net>" - " Thomas Abraham <thomas.abraham@linaro.org>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - kgene.kim@samsung.com - linux-samsung-soc@vger.kernel.org - " devicetree-discuss@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, 2 May 2012 10:57:11 -0700, Olof Johansson <olof@lixom.net> wrote:\n" @@ -24,28 +19,28 @@ "> >\n" "> > Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>\n" "> > ---\n" - "> > \303\202\302\240arch/arm/boot/dts/exynos5250-smdk5250.dts | \303\202\302\240 11 ++++++\n" - "> > \303\202\302\240arch/arm/boot/dts/exynos5250.dtsi \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 | \303\202\302\240 55 +++++++++++++++++++++++++++++\n" - "> > \303\202\302\2402 files changed, 66 insertions(+), 0 deletions(-)\n" + "> > ??arch/arm/boot/dts/exynos5250-smdk5250.dts | ?? 11 ++++++\n" + "> > ??arch/arm/boot/dts/exynos5250.dtsi ?? ?? ?? ?? | ?? 55 +++++++++++++++++++++++++++++\n" + "> > ??2 files changed, 66 insertions(+), 0 deletions(-)\n" "> >\n" "> > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts\n" "> > index bcc4b89..dbc4bdb 100644\n" "> > --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts\n" "> > +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts\n" "> > @@ -24,6 +24,17 @@\n" - "> > \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240bootargs = \"root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200\";\n" - "> > \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240};\n" + "> > ?? ?? ?? ?? ?? ?? ?? ??bootargs = \"root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200\";\n" + "> > ?? ?? ?? ??};\n" "> >\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 lan9215@0x05000000 {\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 compatible = \"smsc,lan9215\", \"smsc,lan9115\";\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 reg = <0x05000000 0x20000>;\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 interrupts = <5 0>;\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 interrupt-parent = <&wakeup_eint>;\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 phy-mode = \"mii\";\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 smsc,irq-push-pull;\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 smsc,force-internal-phy;\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 local-mac-address = [00 80 00 23 45 67];\n" - "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 };\n" + "> > + ?? ?? ?? lan9215 at 0x05000000 {\n" + "> > + ?? ?? ?? ?? ?? ?? ?? compatible = \"smsc,lan9215\", \"smsc,lan9115\";\n" + "> > + ?? ?? ?? ?? ?? ?? ?? reg = <0x05000000 0x20000>;\n" + "> > + ?? ?? ?? ?? ?? ?? ?? interrupts = <5 0>;\n" + "> > + ?? ?? ?? ?? ?? ?? ?? interrupt-parent = <&wakeup_eint>;\n" + "> > + ?? ?? ?? ?? ?? ?? ?? phy-mode = \"mii\";\n" + "> > + ?? ?? ?? ?? ?? ?? ?? smsc,irq-push-pull;\n" + "> > + ?? ?? ?? ?? ?? ?? ?? smsc,force-internal-phy;\n" + "> > + ?? ?? ?? ?? ?? ?? ?? local-mac-address = [00 80 00 23 45 67];\n" + "> > + ?? ?? ?? };\n" "> > +\n" "> \n" "> since the 911x sits on a chipselect bus, you should instead add that\n" @@ -65,7 +60,7 @@ "> and in the dts:\n" "> \n" "> sromc-bus {\n" - "> lan9215@1,0 {\n" + "> lan9215 at 1,0 {\n" "> compatible = \"smsc,lan9215\", \"smsc,lan9115\";\n" "> reg = <1 0 0x20000>;\n" "> interrupts = <5 0>;\n" @@ -97,4 +92,4 @@ "\n" Very bad practice indeed. -d1a07ebc4731757400c003347450e9505cd38985b3e61756bd23f397c892ef31 +3ee64a6f05625aedf1e279d5e7244e8c2cf97c5817a2b644f378eca5ab4e3737
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.