diff for duplicates of <4FBB909F.4090606@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 119858b..73fcce3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On 05/22/2012 12:09 PM, ludovic.desroches@atmel.com : +On 05/22/2012 12:09 PM, ludovic.desroches at atmel.com : > From: Ludovic Desroches <ludovic.desroches@atmel.com> > > Add nodes for mci controllers. @@ -32,20 +32,20 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > status = "disabled"; > }; > + -> + mmc0: mmc@fffa800 { +> + mmc0: mmc at fffa800 { > + compatible = "atmel,hsmci"; > + reg = <0xfffa800 0x600>; > + interrupts = <9 4>; > + status = "disabled"; > + #address-cells = <1>; > + #size-cells = <0>; -> + slot@0 { +> + slot at 0 { > + reg = <0>; > + }; > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts > index 7829a4d..dd94f4b 100644 > --- a/arch/arm/boot/dts/at91sam9g25ek.dts @@ -55,24 +55,24 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > status = "okay"; > }; > + -> + mmc0: mmc@f0008000 { +> + mmc0: mmc at f0008000 { > + status = "okay"; -> + slot@0 { +> + slot at 0 { > + bus-width = <4>; > + cd-gpios = <&pioD 15 0>; > + }; > + }; > + -> + mmc1: mmc@f000c000 { +> + mmc1: mmc at f000c000 { > + status = "okay"; -> + slot@0 { +> + slot at 0 { > + bus-width = <4>; > + cd-gpios = <&pioD 14 0>; > + }; > + }; > }; > -> usb0: ohci@00600000 { +> usb0: ohci at 00600000 { > diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi > index c804214..2922648 100644 > --- a/arch/arm/boot/dts/at91sam9g45.dtsi @@ -82,32 +82,32 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > status = "disabled"; > }; > + -> + mmc0: mmc@fff80000 { +> + mmc0: mmc at fff80000 { > + compatible = "atmel,hsmci"; > + reg = <0xfff80000 0x600>; > + interrupts = <11 4>; > + status = "disabled"; > + #address-cells = <1>; > + #size-cells = <0>; -> + slot@0 { +> + slot at 0 { > + reg = <0>; > + }; > + }; > + -> + mmc1: mmc@fffd0000 { +> + mmc1: mmc at fffd0000 { > + compatible = "atmel,hsmci"; > + reg = <0xfffd0000 0x600>; > + interrupts = <29 4>; > + status = "disabled"; > + #address-cells = <1>; > + #size-cells = <0>; -> + slot@0 { +> + slot at 0 { > + reg = <0>; > + }; > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts > index a3633bd..bc4cb3c 100644 > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -117,17 +117,17 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > status = "okay"; > }; > + -> + mmc0: mmc@fff80000 { +> + mmc0: mmc at fff80000 { > + status = "okay"; -> + slot@0 { +> + slot at 0 { > + bus-width = <4>; > + cd-gpios = <&pioD 10 0>; > + }; > + }; > + -> + mmc1: mmc@fffd0000 { +> + mmc1: mmc at fffd0000 { > + status = "okay"; -> + slot@0 { +> + slot at 0 { > + bus-width = <4>; > + cd-gpios = <&pioD 11 0>; > + wp-gpios = <&pioD 29 0>; @@ -135,7 +135,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi > index dd4ed74..d5999b2 100644 > --- a/arch/arm/boot/dts/at91sam9x5.dtsi @@ -145,32 +145,32 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > status = "disabled"; > }; > + -> + mmc0: mmc@f0008000 { +> + mmc0: mmc at f0008000 { > + compatible = "atmel,hsmci"; > + reg = <0xf0008000 0x600>; > + interrupts = <12 4>; > + status = "disabled"; > + #address-cells = <1>; > + #size-cells = <0>; -> + slot@0 { +> + slot at 0 { > + reg = <0>; > + }; > + }; > + -> + mmc1: mmc@f000c000 { +> + mmc1: mmc at f000c000 { > + compatible = "atmel,hsmci"; > + reg = <0xf000c000 0x600>; > + interrupts = <26 4>; > + status = "disabled"; > + #address-cells = <1>; > + #size-cells = <0>; -> + slot@0 { +> + slot at 0 { > + reg = <0>; > + }; > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { -- diff --git a/a/content_digest b/N1/content_digest index 42aa257..1aba674 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,12 @@ "ref\01337681352-18521-1-git-send-email-ludovic.desroches@atmel.com\0" "ref\01337681352-18521-4-git-send-email-ludovic.desroches@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [PATCH v3 3/3] ARM: dts: add nodes for atmel hsmci controllers for atmel platforms\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH v3 3/3] ARM: dts: add nodes for atmel hsmci controllers for atmel platforms\0" "Date\0Tue, 22 May 2012 15:11:59 +0200\0" - "To\0ludovic.desroches@atmel.com\0" - "Cc\0linux-mmc@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - plagnioj@jcrosoft.com - " devicetree-discuss@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On 05/22/2012 12:09 PM, ludovic.desroches@atmel.com :\n" + "On 05/22/2012 12:09 PM, ludovic.desroches at atmel.com :\n" "> From: Ludovic Desroches <ludovic.desroches@atmel.com>\n" "> \n" "> Add nodes for mci controllers.\n" @@ -44,20 +40,20 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmmc0: mmc@fffa800 {\n" + "> +\t\t\tmmc0: mmc at fffa800 {\n" "> +\t\t\t\tcompatible = \"atmel,hsmci\";\n" "> +\t\t\t\treg = <0xfffa800 0x600>;\n" "> +\t\t\t\tinterrupts = <9 4>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" - "> +\t\t\t\tslot@0 {\n" + "> +\t\t\t\tslot at 0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts\n" "> index 7829a4d..dd94f4b 100644\n" "> --- a/arch/arm/boot/dts/at91sam9g25ek.dts\n" @@ -67,24 +63,24 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmmc0: mmc@f0008000 {\n" + "> +\t\t\tmmc0: mmc at f0008000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" - "> +\t\t\t\tslot@0 {\n" + "> +\t\t\t\tslot at 0 {\n" "> +\t\t\t\t\tbus-width = <4>;\n" "> +\t\t\t\t\tcd-gpios = <&pioD 15 0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc1: mmc@f000c000 {\n" + "> +\t\t\tmmc1: mmc at f000c000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" - "> +\t\t\t\tslot@0 {\n" + "> +\t\t\t\tslot at 0 {\n" "> +\t\t\t\t\tbus-width = <4>;\n" "> +\t\t\t\t\tcd-gpios = <&pioD 14 0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tusb0: ohci@00600000 {\n" + "> \t\tusb0: ohci at 00600000 {\n" "> diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi\n" "> index c804214..2922648 100644\n" "> --- a/arch/arm/boot/dts/at91sam9g45.dtsi\n" @@ -94,32 +90,32 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmmc0: mmc@fff80000 {\n" + "> +\t\t\tmmc0: mmc at fff80000 {\n" "> +\t\t\t\tcompatible = \"atmel,hsmci\";\n" "> +\t\t\t\treg = <0xfff80000 0x600>;\n" "> +\t\t\t\tinterrupts = <11 4>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" - "> +\t\t\t\tslot@0 {\n" + "> +\t\t\t\tslot at 0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc1: mmc@fffd0000 {\n" + "> +\t\t\tmmc1: mmc at fffd0000 {\n" "> +\t\t\t\tcompatible = \"atmel,hsmci\";\n" "> +\t\t\t\treg = <0xfffd0000 0x600>;\n" "> +\t\t\t\tinterrupts = <29 4>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" - "> +\t\t\t\tslot@0 {\n" + "> +\t\t\t\tslot at 0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" "> index a3633bd..bc4cb3c 100644\n" "> --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" @@ -129,17 +125,17 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmmc0: mmc@fff80000 {\n" + "> +\t\t\tmmc0: mmc at fff80000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" - "> +\t\t\t\tslot@0 {\n" + "> +\t\t\t\tslot at 0 {\n" "> +\t\t\t\t\tbus-width = <4>;\n" "> +\t\t\t\t\tcd-gpios = <&pioD 10 0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc1: mmc@fffd0000 {\n" + "> +\t\t\tmmc1: mmc at fffd0000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" - "> +\t\t\t\tslot@0 {\n" + "> +\t\t\t\tslot at 0 {\n" "> +\t\t\t\t\tbus-width = <4>;\n" "> +\t\t\t\t\tcd-gpios = <&pioD 11 0>;\n" "> +\t\t\t\t\twp-gpios = <&pioD 29 0>;\n" @@ -147,7 +143,7 @@ "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi\n" "> index dd4ed74..d5999b2 100644\n" "> --- a/arch/arm/boot/dts/at91sam9x5.dtsi\n" @@ -157,35 +153,35 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmmc0: mmc@f0008000 {\n" + "> +\t\t\tmmc0: mmc at f0008000 {\n" "> +\t\t\t\tcompatible = \"atmel,hsmci\";\n" "> +\t\t\t\treg = <0xf0008000 0x600>;\n" "> +\t\t\t\tinterrupts = <12 4>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" - "> +\t\t\t\tslot@0 {\n" + "> +\t\t\t\tslot at 0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc1: mmc@f000c000 {\n" + "> +\t\t\tmmc1: mmc at f000c000 {\n" "> +\t\t\t\tcompatible = \"atmel,hsmci\";\n" "> +\t\t\t\treg = <0xf000c000 0x600>;\n" "> +\t\t\t\tinterrupts = <26 4>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" - "> +\t\t\t\tslot@0 {\n" + "> +\t\t\t\tslot at 0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "\n" "\n" "-- \n" Nicolas Ferre -50f101a5d9368d68f7d6d0f00e2a17a259918c3a26ac26ad4c604af49d565ae1 +f4cc1a36dd99d90dc32b356d13b3181c9be586973e2482d3141cacaa09956776
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.