diff for duplicates of <87si5bgg6k.fsf@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 40c8f4b..f52a553 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Gregory > @@ -82,10 +82,7 @@ > apb { > -> adc0: adc at fc034000 { +> adc0: adc@fc034000 { > - /* The vref depends on JP22 of EK. If connect 1-2 then use 3.3V. connect 2-3 use 3.0V */ > - atmel,adc-vref = <3300>; > - /*atmel,adc-ts-wires = <4>;*/ /* Set up ADC touch screen */ @@ -33,7 +33,7 @@ Gregory > + status = "okay"; /* Enable ADC IIO support */ > }; > -> mmc0: mmc at f8000000 { +> mmc0: mmc@f8000000 { > diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi > index b5ee947..6f27915 100644 > --- a/arch/arm/boot/dts/sama5d4.dtsi @@ -42,7 +42,7 @@ Gregory > clock-names = "t0_clk", "slow_clk"; > }; > -> + macb1: ethernet at fc028000 { +> + macb1: ethernet@fc028000 { > + compatible = "atmel,sama5d4-gem"; > + reg = <0xfc028000 0x100>; > + interrupts = <55 IRQ_TYPE_LEVEL_HIGH 3>; @@ -55,7 +55,7 @@ Gregory > + status = "disabled"; > + }; > + -> adc0: adc at fc034000 { +> adc0: adc@fc034000 { > compatible = "atmel,at91sam9x5-adc"; > reg = <0xfc034000 0x100>; > @@ -1635,6 +1648,23 @@ diff --git a/a/content_digest b/N1/content_digest index 07547d6..fca858c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,12 @@ "ref\01444997510-8841-1-git-send-email-gregory.clement@free-electrons.com\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH] ARM: at91/dt: sama5d4: add the macb1 node\0" + "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: sama5d4: add the macb1 node\0" "Date\0Fri, 16 Oct 2015 14:18:27 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Cc\0Alexandre Belloni <alexandre.belloni@free-electrons.com>" + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Hi all,\n" @@ -32,7 +36,7 @@ "> @@ -82,10 +82,7 @@\n" "> \t\tapb {\n" "> \n" - "> \t\t\tadc0: adc at fc034000 {\n" + "> \t\t\tadc0: adc@fc034000 {\n" "> -\t\t\t\t/* The vref depends on JP22 of EK. If connect 1-2 then use 3.3V. connect 2-3 use 3.0V */\n" "> -\t\t\t\tatmel,adc-vref = <3300>;\n" "> -\t\t\t\t/*atmel,adc-ts-wires = <4>;*/\t/* Set up ADC touch screen */\n" @@ -40,7 +44,7 @@ "> +\t\t\t\tstatus = \"okay\"; /* Enable ADC IIO support */\n" "> \t\t\t};\n" "> \n" - "> \t\t\tmmc0: mmc at f8000000 {\n" + "> \t\t\tmmc0: mmc@f8000000 {\n" "> diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi\n" "> index b5ee947..6f27915 100644\n" "> --- a/arch/arm/boot/dts/sama5d4.dtsi\n" @@ -49,7 +53,7 @@ "> \t\t\t\tclock-names = \"t0_clk\", \"slow_clk\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tmacb1: ethernet at fc028000 {\n" + "> +\t\t\tmacb1: ethernet@fc028000 {\n" "> +\t\t\t\tcompatible = \"atmel,sama5d4-gem\";\n" "> +\t\t\t\treg = <0xfc028000 0x100>;\n" "> +\t\t\t\tinterrupts = <55 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -62,7 +66,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tadc0: adc at fc034000 {\n" + "> \t\t\tadc0: adc@fc034000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-adc\";\n" "> \t\t\t\treg = <0xfc034000 0x100>;\n" "> @@ -1635,6 +1648,23 @@\n" @@ -99,4 +103,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -57adaea314a49a38c53b03a7a05fdb2015da8a82575f190b499057f717a96555 +9400bce936c0479a5bfdf945aecd6924a06c27118412bfc3b9d9f259f11b2c46
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.