diff for duplicates of <5090F1C0.1010303@atmel.com> diff --git a/a/1.txt b/N1/1.txt index d2873cc..f7c6053 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -277,14 +277,14 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > spin_lock(&user_lock); > list_for_each_entry(ssc, &ssc_list, list) { -> - if (ssc->pdev->id == ssc_num) { +> - if (ssc->pdev->id = ssc_num) { > + if (ssc->pdev->dev.of_node) { > + if (of_alias_get_id(ssc->pdev->dev.of_node, "ssc") -> + == ssc_num) { +> + = ssc_num) { > + ssc_valid = 1; > + break; > + } -> + } else if (ssc->pdev->id == ssc_num) { +> + } else if (ssc->pdev->id = ssc_num) { > ssc_valid = 1; > break; > } @@ -313,7 +313,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + if (pdev->dev.of_node) { > + const struct of_device_id *match; > + match = of_match_node(atmel_ssc_dt_ids, pdev->dev.of_node); -> + if (match == NULL) +> + if (match = NULL) > + return NULL; > + return match->data; > + } diff --git a/a/content_digest b/N1/content_digest index c6fe316..5d8da31 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01351668420-18447-2-git-send-email-voice.shen@atmel.com\0" "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" "Subject\0Re: [Patch v2 2/4] ARM: at91: atmel-ssc: add device tree support\0" - "Date\0Wed, 31 Oct 2012 10:39:12 +0100\0" + "Date\0Wed, 31 Oct 2012 08:39:11 +0000\0" "To\0Bo Shen <voice.shen@atmel.com>\0" "Cc\0broonie@opensource.wolfsonmicro.com" linux-arm-kernel@lists.infradead.org @@ -292,14 +292,14 @@ "> \n" "> \tspin_lock(&user_lock);\n" "> \tlist_for_each_entry(ssc, &ssc_list, list) {\n" - "> -\t\tif (ssc->pdev->id == ssc_num) {\n" + "> -\t\tif (ssc->pdev->id = ssc_num) {\n" "> +\t\tif (ssc->pdev->dev.of_node) {\n" "> +\t\t\tif (of_alias_get_id(ssc->pdev->dev.of_node, \"ssc\")\n" - "> +\t\t\t\t== ssc_num) {\n" + "> +\t\t\t\t= ssc_num) {\n" "> +\t\t\t\tssc_valid = 1;\n" "> +\t\t\t\tbreak;\n" "> +\t\t\t}\n" - "> +\t\t} else if (ssc->pdev->id == ssc_num) {\n" + "> +\t\t} else if (ssc->pdev->id = ssc_num) {\n" "> \t\t\tssc_valid = 1;\n" "> \t\t\tbreak;\n" "> \t\t}\n" @@ -328,7 +328,7 @@ "> +\tif (pdev->dev.of_node) {\n" "> +\t\tconst struct of_device_id *match;\n" "> +\t\tmatch = of_match_node(atmel_ssc_dt_ids, pdev->dev.of_node);\n" - "> +\t\tif (match == NULL)\n" + "> +\t\tif (match = NULL)\n" "> +\t\t\treturn NULL;\n" "> +\t\treturn match->data;\n" "> +\t}\n" @@ -373,4 +373,4 @@ "-- \n" Nicolas Ferre -ca3a2b00d8fba68cd96d2a3207fe94150db181d015f54eb6c0323c5b4613dd65 +d263ca6673339fdb87a80136123a3539b3c5b45041613f05738c8d9a8b079432
diff --git a/a/1.txt b/N2/1.txt index d2873cc..38c6f97 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -44,7 +44,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > +- interrupts: Should contain SSC interrupt > + > +Example: -> +ssc0: ssc@fffbc000 { +> +ssc0: ssc at fffbc000 { > + compatible = "atmel,at91rm9200-ssc"; > + reg = <0xfffbc000 0x4000>; > + interrupts = <14 4 5>; @@ -60,19 +60,19 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + ssc0 = &ssc0; > }; > cpus { -> cpu@0 { +> cpu at 0 { > @@ -212,6 +213,13 @@ > status = "disabled"; > }; > -> + ssc0: ssc@fffbc000 { +> + ssc0: ssc at fffbc000 { > + compatible = "atmel,at91rm9200-ssc"; > + reg = <0xfffbc000 0x4000>; > + interrupts = <14 4 5>; > + status = "disable"; > + }; > + -> adc0: adc@fffe0000 { +> adc0: adc at fffe0000 { > compatible = "atmel,at91sam9260-adc"; > reg = <0xfffe0000 0x100>; > diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi @@ -87,26 +87,26 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + ssc1 = &ssc1; > }; > cpus { -> cpu@0 { +> cpu at 0 { > @@ -173,6 +175,20 @@ > status = "disabled"; > }; > -> + ssc0: ssc@fff98000 { +> + ssc0: ssc at fff98000 { > + compatible = "atmel,at91rm9200-ssc"; > + reg = <0xfff98000 0x4000>; > + interrupts = <16 4 5>; > + status = "disable"; > + }; > + -> + ssc1: ssc@fff9c000 { +> + ssc1: ssc at fff9c000 { > + compatible = "atmel,at91rm9200-ssc"; > + reg = <0xfff9c000 0x4000>; > + interrupts = <17 4 5>; > + status = "disable"; > + }; > + -> macb0: ethernet@fffbc000 { +> macb0: ethernet at fffbc000 { > compatible = "cdns,at32ap7000-macb", "cdns,macb"; > reg = <0xfffbc000 0x100>; > diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi @@ -121,26 +121,26 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + ssc1 = &ssc1; > }; > cpus { -> cpu@0 { +> cpu at 0 { > @@ -226,6 +228,20 @@ > status = "disabled"; > }; > -> + ssc0: ssc@fff9c000 { +> + ssc0: ssc at fff9c000 { > + compatible = "atmel,at91sam9g45-ssc"; > + reg = <0xfff9c000 0x4000>; > + interrupts = <16 4 5>; > + status = "disable"; > + }; > + -> + ssc0: ssc@fffa0000 { +> + ssc0: ssc at fffa0000 { > + compatible = "atmel,at91sam9g45-ssc"; > + reg = <0xfffa0000 0x4000>; > + interrupts = <17 4 5>; > + status = "disable"; > + }; > + -> adc0: adc@fffb0000 { +> adc0: adc at fffb0000 { > compatible = "atmel,at91sam9260-adc"; > reg = <0xfffb0000 0x100>; > diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -154,19 +154,19 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + ssc0 = &ssc0; > }; > cpus { -> cpu@0 { +> cpu at 0 { > @@ -87,6 +88,13 @@ > interrupts = <1 4 7>; > }; > -> + ssc0: ssc@f0010000 { +> + ssc0: ssc at f0010000 { > + compatible = "atmel,at91sam9g45-ssc"; > + reg = <0xf0010000 0x4000>; > + interrupts = <28 4 5>; > + status = "disable"; > + }; > + -> tcb0: timer@f8008000 { +> tcb0: timer at f8008000 { > compatible = "atmel,at91sam9x5-tcb"; > reg = <0xf8008000 0x100>; > diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c diff --git a/a/content_digest b/N2/content_digest index c6fe316..eb84451 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,9 @@ "ref\01351668420-18447-1-git-send-email-voice.shen@atmel.com\0" "ref\01351668420-18447-2-git-send-email-voice.shen@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [Patch v2 2/4] ARM: at91: atmel-ssc: add device tree support\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[Patch v2 2/4] ARM: at91: atmel-ssc: add device tree support\0" "Date\0Wed, 31 Oct 2012 10:39:12 +0100\0" - "To\0Bo Shen <voice.shen@atmel.com>\0" - "Cc\0broonie@opensource.wolfsonmicro.com" - linux-arm-kernel@lists.infradead.org - devicetree-discuss@lists.ozlabs.org - linux-sound@vger.kernel.org - alsa-devel@alsa-project.org - plagnioj@jcrosoft.com - " jm.lin@atmel.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 10/31/2012 08:26 AM, Bo Shen :\n" @@ -59,7 +52,7 @@ "> +- interrupts: Should contain SSC interrupt\n" "> +\n" "> +Example:\n" - "> +ssc0: ssc@fffbc000 {\n" + "> +ssc0: ssc at fffbc000 {\n" "> +\tcompatible = \"atmel,at91rm9200-ssc\";\n" "> +\treg = <0xfffbc000 0x4000>;\n" "> +\tinterrupts = <14 4 5>;\n" @@ -75,19 +68,19 @@ "> +\t\tssc0 = &ssc0;\n" "> \t};\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> @@ -212,6 +213,13 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tssc0: ssc@fffbc000 {\n" + "> +\t\t\tssc0: ssc at fffbc000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91rm9200-ssc\";\n" "> +\t\t\t\treg = <0xfffbc000 0x4000>;\n" "> +\t\t\t\tinterrupts = <14 4 5>;\n" "> +\t\t\t\tstatus = \"disable\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tadc0: adc@fffe0000 {\n" + "> \t\t\tadc0: adc at fffe0000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-adc\";\n" "> \t\t\t\treg = <0xfffe0000 0x100>;\n" "> diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi\n" @@ -102,26 +95,26 @@ "> +\t\tssc1 = &ssc1;\n" "> \t};\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> @@ -173,6 +175,20 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tssc0: ssc@fff98000 {\n" + "> +\t\t\tssc0: ssc at fff98000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91rm9200-ssc\";\n" "> +\t\t\t\treg = <0xfff98000 0x4000>;\n" "> +\t\t\t\tinterrupts = <16 4 5>;\n" "> +\t\t\t\tstatus = \"disable\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tssc1: ssc@fff9c000 {\n" + "> +\t\t\tssc1: ssc at fff9c000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91rm9200-ssc\";\n" "> +\t\t\t\treg = <0xfff9c000 0x4000>;\n" "> +\t\t\t\tinterrupts = <17 4 5>;\n" "> +\t\t\t\tstatus = \"disable\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmacb0: ethernet@fffbc000 {\n" + "> \t\t\tmacb0: ethernet at fffbc000 {\n" "> \t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> \t\t\t\treg = <0xfffbc000 0x100>;\n" "> diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi\n" @@ -136,26 +129,26 @@ "> +\t\tssc1 = &ssc1;\n" "> \t};\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> @@ -226,6 +228,20 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tssc0: ssc@fff9c000 {\n" + "> +\t\t\tssc0: ssc at fff9c000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-ssc\";\n" "> +\t\t\t\treg = <0xfff9c000 0x4000>;\n" "> +\t\t\t\tinterrupts = <16 4 5>;\n" "> +\t\t\t\tstatus = \"disable\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tssc0: ssc@fffa0000 {\n" + "> +\t\t\tssc0: ssc at fffa0000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-ssc\";\n" "> +\t\t\t\treg = <0xfffa0000 0x4000>;\n" "> +\t\t\t\tinterrupts = <17 4 5>;\n" "> +\t\t\t\tstatus = \"disable\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tadc0: adc@fffb0000 {\n" + "> \t\t\tadc0: adc at fffb0000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-adc\";\n" "> \t\t\t\treg = <0xfffb0000 0x100>;\n" "> diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi\n" @@ -169,19 +162,19 @@ "> +\t\tssc0 = &ssc0;\n" "> \t};\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> @@ -87,6 +88,13 @@\n" "> \t\t\t\tinterrupts = <1 4 7>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tssc0: ssc@f0010000 {\n" + "> +\t\t\tssc0: ssc at f0010000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-ssc\";\n" "> +\t\t\t\treg = <0xf0010000 0x4000>;\n" "> +\t\t\t\tinterrupts = <28 4 5>;\n" "> +\t\t\t\tstatus = \"disable\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\ttcb0: timer@f8008000 {\n" + "> \t\t\ttcb0: timer at f8008000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-tcb\";\n" "> \t\t\t\treg = <0xf8008000 0x100>;\n" "> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c\n" @@ -373,4 +366,4 @@ "-- \n" Nicolas Ferre -ca3a2b00d8fba68cd96d2a3207fe94150db181d015f54eb6c0323c5b4613dd65 +291dba4f30644b77a94404fb692edbf2d14312cae881e576e41535fab6f6e54f
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.