diff for duplicates of <1621893.Re68yLczyK@avalon> diff --git a/a/1.txt b/N1/1.txt index 0b39957..794a080 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -193,22 +193,16 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > - { .compatible = "renesas,shmobile-sdhi" }, > - { .compatible = "renesas,sh7372-sdhi" }, > - { .compatible = "renesas,sh73a0-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], -> }, - { .compatible = "renesas,r8a73a4-sdhi", .data = -> &sh_mobile_sdhi_of_cfg[0], }, - { .compatible = "renesas,r8a7740-sdhi", -> .data = &sh_mobile_sdhi_of_cfg[0], }, - { .compatible = -> "renesas,r8a7778-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], }, - { +> }, - { .compatible = "renesas,r8a73a4-sdhi", .data > &sh_mobile_sdhi_of_cfg[0], }, - { .compatible = "renesas,r8a7740-sdhi", +> .data = &sh_mobile_sdhi_of_cfg[0], }, - { .compatible > "renesas,r8a7778-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], }, - { > .compatible = "renesas,r8a7779-sdhi", .data = &sh_mobile_sdhi_of_cfg[0], }, -> - { .compatible = "renesas,r8a7790-sdhi", .data = -> &sh_mobile_sdhi_of_cfg[0], }, + { .compatible = "renesas,sdhi-shmobile" }, +> - { .compatible = "renesas,r8a7790-sdhi", .data > &sh_mobile_sdhi_of_cfg[0], }, + { .compatible = "renesas,sdhi-shmobile" }, > + { .compatible = "renesas,sdhi-sh7372" }, > + { .compatible = "renesas,sdhi-sh73a0", .data = &sh_mobile_sdhi_of_cfg[0], -> }, + { .compatible = "renesas,sdhi-r8a73a4", .data = -> &sh_mobile_sdhi_of_cfg[0], }, + { .compatible = "renesas,sdhi-r8a7740", -> .data = &sh_mobile_sdhi_of_cfg[0], }, + { .compatible = -> "renesas,sdhi-r8a7778", .data = &sh_mobile_sdhi_of_cfg[0], }, + { +> }, + { .compatible = "renesas,sdhi-r8a73a4", .data > &sh_mobile_sdhi_of_cfg[0], }, + { .compatible = "renesas,sdhi-r8a7740", +> .data = &sh_mobile_sdhi_of_cfg[0], }, + { .compatible > "renesas,sdhi-r8a7778", .data = &sh_mobile_sdhi_of_cfg[0], }, + { > .compatible = "renesas,sdhi-r8a7779", .data = &sh_mobile_sdhi_of_cfg[0], }, -> + { .compatible = "renesas,sdhi-r8a7790", .data = -> &sh_mobile_sdhi_of_cfg[0], }, {}, +> + { .compatible = "renesas,sdhi-r8a7790", .data > &sh_mobile_sdhi_of_cfg[0], }, {}, > }; > MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match); -- diff --git a/a/content_digest b/N1/content_digest index abbd74f..7bf4906 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,8 @@ "ref\0Pine.LNX.4.64.1308291650120.3786@axis700.grange\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH] ARM: shmobile: update SDHI DT compatibility string to the <unit>-<soc> format\0" - "Date\0Fri, 30 Aug 2013 01:47:21 +0200\0" - "To\0Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" - "Cc\0linux-sh@vger.kernel.org" - Olof Johansson <olof@lixom.net> - Simon Horman <horms@verge.net.au> - Arnd Bergmann <arnd@arndb.de> - Magnus Damm <magnus.damm@gmail.com> - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - Stephen Warren <swarren@wwwdotorg.org> - linux-mmc@vger.kernel.org - " Chris Ball <cjb@laptop.org>\0" + "Date\0Thu, 29 Aug 2013 23:47:21 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Guennadi,\n" @@ -210,22 +200,16 @@ "> -\t{ .compatible = \"renesas,shmobile-sdhi\" },\n" "> -\t{ .compatible = \"renesas,sh7372-sdhi\" },\n" "> -\t{ .compatible = \"renesas,sh73a0-sdhi\", .data = &sh_mobile_sdhi_of_cfg[0],\n" - "> }, -\t{ .compatible = \"renesas,r8a73a4-sdhi\", .data =\n" - "> &sh_mobile_sdhi_of_cfg[0], }, -\t{ .compatible = \"renesas,r8a7740-sdhi\",\n" - "> .data = &sh_mobile_sdhi_of_cfg[0], }, -\t{ .compatible =\n" - "> \"renesas,r8a7778-sdhi\", .data = &sh_mobile_sdhi_of_cfg[0], }, -\t{\n" + "> }, -\t{ .compatible = \"renesas,r8a73a4-sdhi\", .data > &sh_mobile_sdhi_of_cfg[0], }, -\t{ .compatible = \"renesas,r8a7740-sdhi\",\n" + "> .data = &sh_mobile_sdhi_of_cfg[0], }, -\t{ .compatible > \"renesas,r8a7778-sdhi\", .data = &sh_mobile_sdhi_of_cfg[0], }, -\t{\n" "> .compatible = \"renesas,r8a7779-sdhi\", .data = &sh_mobile_sdhi_of_cfg[0], },\n" - "> -\t{ .compatible = \"renesas,r8a7790-sdhi\", .data =\n" - "> &sh_mobile_sdhi_of_cfg[0], }, +\t{ .compatible = \"renesas,sdhi-shmobile\" },\n" + "> -\t{ .compatible = \"renesas,r8a7790-sdhi\", .data > &sh_mobile_sdhi_of_cfg[0], }, +\t{ .compatible = \"renesas,sdhi-shmobile\" },\n" "> +\t{ .compatible = \"renesas,sdhi-sh7372\" },\n" "> +\t{ .compatible = \"renesas,sdhi-sh73a0\", .data = &sh_mobile_sdhi_of_cfg[0],\n" - "> }, +\t{ .compatible = \"renesas,sdhi-r8a73a4\", .data =\n" - "> &sh_mobile_sdhi_of_cfg[0], }, +\t{ .compatible = \"renesas,sdhi-r8a7740\",\n" - "> .data = &sh_mobile_sdhi_of_cfg[0], }, +\t{ .compatible =\n" - "> \"renesas,sdhi-r8a7778\", .data = &sh_mobile_sdhi_of_cfg[0], }, +\t{\n" + "> }, +\t{ .compatible = \"renesas,sdhi-r8a73a4\", .data > &sh_mobile_sdhi_of_cfg[0], }, +\t{ .compatible = \"renesas,sdhi-r8a7740\",\n" + "> .data = &sh_mobile_sdhi_of_cfg[0], }, +\t{ .compatible > \"renesas,sdhi-r8a7778\", .data = &sh_mobile_sdhi_of_cfg[0], }, +\t{\n" "> .compatible = \"renesas,sdhi-r8a7779\", .data = &sh_mobile_sdhi_of_cfg[0], },\n" - "> +\t{ .compatible = \"renesas,sdhi-r8a7790\", .data =\n" - "> &sh_mobile_sdhi_of_cfg[0], }, {},\n" + "> +\t{ .compatible = \"renesas,sdhi-r8a7790\", .data > &sh_mobile_sdhi_of_cfg[0], }, {},\n" "> };\n" "> MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);\n" "-- \n" @@ -233,4 +217,4 @@ "\n" Laurent Pinchart -565a6cec882fee638b7acd8da1dfd6c776edc6389c6bbec6cf2191693b1846b8 +56656530579643fcebb54f14f3ad3855ea785268b0fe2c101f529b979bd526ae
diff --git a/a/1.txt b/N2/1.txt index 0b39957..bece566 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -65,7 +65,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -236,7 +236,7 @@ > }; > -> sdhi0: sdhi@ee100000 { +> sdhi0: sdhi at ee100000 { > - compatible = "renesas,r8a73a4-sdhi"; > + compatible = "renesas,sdhi-r8a73a4"; > reg = <0 0xee100000 0 0x100>; @@ -74,7 +74,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -245,7 +245,7 @@ > }; > -> sdhi1: sdhi@ee120000 { +> sdhi1: sdhi at ee120000 { > - compatible = "renesas,r8a73a4-sdhi"; > + compatible = "renesas,sdhi-r8a73a4"; > reg = <0 0xee120000 0 0x100>; @@ -83,7 +83,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -254,7 +254,7 @@ > }; > -> sdhi2: sdhi@ee140000 { +> sdhi2: sdhi at ee140000 { > - compatible = "renesas,r8a73a4-sdhi"; > + compatible = "renesas,sdhi-r8a73a4"; > reg = <0 0xee140000 0 0x100>; @@ -96,7 +96,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -155,7 +155,7 @@ > }; > -> sdhi0: sdhi@e6850000 { +> sdhi0: sdhi at e6850000 { > - compatible = "renesas,r8a7740-sdhi"; > + compatible = "renesas,sdhi-r8a7740"; > reg = <0xe6850000 0x100>; @@ -105,7 +105,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -167,7 +167,7 @@ > }; > -> sdhi1: sdhi@e6860000 { +> sdhi1: sdhi at e6860000 { > - compatible = "renesas,r8a7740-sdhi"; > + compatible = "renesas,sdhi-r8a7740"; > reg = <0xe6860000 0x100>; @@ -118,7 +118,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -152,7 +152,7 @@ > }; > -> sdhi0: sdhi@ee100000 { +> sdhi0: sdhi at ee100000 { > - compatible = "renesas,r8a7790-sdhi"; > + compatible = "renesas,sdhi-r8a7790"; > reg = <0 0xee100000 0 0x100>; @@ -127,7 +127,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -161,7 +161,7 @@ > }; > -> sdhi1: sdhi@ee120000 { +> sdhi1: sdhi at ee120000 { > - compatible = "renesas,r8a7790-sdhi"; > + compatible = "renesas,sdhi-r8a7790"; > reg = <0 0xee120000 0 0x100>; @@ -136,7 +136,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -170,7 +170,7 @@ > }; > -> sdhi2: sdhi@ee140000 { +> sdhi2: sdhi at ee140000 { > - compatible = "renesas,r8a7790-sdhi"; > + compatible = "renesas,sdhi-r8a7790"; > reg = <0 0xee140000 0 0x100>; @@ -145,7 +145,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -179,7 +179,7 @@ > }; > -> sdhi3: sdhi@ee160000 { +> sdhi3: sdhi at ee160000 { > - compatible = "renesas,r8a7790-sdhi"; > + compatible = "renesas,sdhi-r8a7790"; > reg = <0 0xee160000 0 0x100>; @@ -158,7 +158,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -196,7 +196,7 @@ > }; > -> sdhi0: sdhi@ee100000 { +> sdhi0: sdhi at ee100000 { > - compatible = "renesas,r8a7740-sdhi"; > + compatible = "renesas,sdhi-r8a7740"; > reg = <0xee100000 0x100>; @@ -167,7 +167,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -208,7 +208,7 @@ > > /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */ -> sdhi1: sdhi@ee120000 { +> sdhi1: sdhi at ee120000 { > - compatible = "renesas,r8a7740-sdhi"; > + compatible = "renesas,sdhi-r8a7740"; > reg = <0xee120000 0x100>; @@ -176,7 +176,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > @@ -219,7 +219,7 @@ > }; > -> sdhi2: sdhi@ee140000 { +> sdhi2: sdhi at ee140000 { > - compatible = "renesas,r8a7740-sdhi"; > + compatible = "renesas,sdhi-r8a7740"; > reg = <0xee140000 0x100>; diff --git a/a/content_digest b/N2/content_digest index abbd74f..5cbf867 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,18 +1,8 @@ "ref\0Pine.LNX.4.64.1308291650120.3786@axis700.grange\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH] ARM: shmobile: update SDHI DT compatibility string to the <unit>-<soc> format\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH] ARM: shmobile: update SDHI DT compatibility string to the <unit>-<soc> format\0" "Date\0Fri, 30 Aug 2013 01:47:21 +0200\0" - "To\0Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" - "Cc\0linux-sh@vger.kernel.org" - Olof Johansson <olof@lixom.net> - Simon Horman <horms@verge.net.au> - Arnd Bergmann <arnd@arndb.de> - Magnus Damm <magnus.damm@gmail.com> - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - Stephen Warren <swarren@wwwdotorg.org> - linux-mmc@vger.kernel.org - " Chris Ball <cjb@laptop.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Guennadi,\n" @@ -82,7 +72,7 @@ "> @@ -236,7 +236,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi0: sdhi@ee100000 {\n" + "> \tsdhi0: sdhi at ee100000 {\n" "> -\t\tcompatible = \"renesas,r8a73a4-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a73a4\";\n" "> \t\treg = <0 0xee100000 0 0x100>;\n" @@ -91,7 +81,7 @@ "> @@ -245,7 +245,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi1: sdhi@ee120000 {\n" + "> \tsdhi1: sdhi at ee120000 {\n" "> -\t\tcompatible = \"renesas,r8a73a4-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a73a4\";\n" "> \t\treg = <0 0xee120000 0 0x100>;\n" @@ -100,7 +90,7 @@ "> @@ -254,7 +254,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi2: sdhi@ee140000 {\n" + "> \tsdhi2: sdhi at ee140000 {\n" "> -\t\tcompatible = \"renesas,r8a73a4-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a73a4\";\n" "> \t\treg = <0 0xee140000 0 0x100>;\n" @@ -113,7 +103,7 @@ "> @@ -155,7 +155,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi0: sdhi@e6850000 {\n" + "> \tsdhi0: sdhi at e6850000 {\n" "> -\t\tcompatible = \"renesas,r8a7740-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a7740\";\n" "> \t\treg = <0xe6850000 0x100>;\n" @@ -122,7 +112,7 @@ "> @@ -167,7 +167,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi1: sdhi@e6860000 {\n" + "> \tsdhi1: sdhi at e6860000 {\n" "> -\t\tcompatible = \"renesas,r8a7740-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a7740\";\n" "> \t\treg = <0xe6860000 0x100>;\n" @@ -135,7 +125,7 @@ "> @@ -152,7 +152,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi0: sdhi@ee100000 {\n" + "> \tsdhi0: sdhi at ee100000 {\n" "> -\t\tcompatible = \"renesas,r8a7790-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a7790\";\n" "> \t\treg = <0 0xee100000 0 0x100>;\n" @@ -144,7 +134,7 @@ "> @@ -161,7 +161,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi1: sdhi@ee120000 {\n" + "> \tsdhi1: sdhi at ee120000 {\n" "> -\t\tcompatible = \"renesas,r8a7790-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a7790\";\n" "> \t\treg = <0 0xee120000 0 0x100>;\n" @@ -153,7 +143,7 @@ "> @@ -170,7 +170,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi2: sdhi@ee140000 {\n" + "> \tsdhi2: sdhi at ee140000 {\n" "> -\t\tcompatible = \"renesas,r8a7790-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a7790\";\n" "> \t\treg = <0 0xee140000 0 0x100>;\n" @@ -162,7 +152,7 @@ "> @@ -179,7 +179,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi3: sdhi@ee160000 {\n" + "> \tsdhi3: sdhi at ee160000 {\n" "> -\t\tcompatible = \"renesas,r8a7790-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a7790\";\n" "> \t\treg = <0 0xee160000 0 0x100>;\n" @@ -175,7 +165,7 @@ "> @@ -196,7 +196,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi0: sdhi@ee100000 {\n" + "> \tsdhi0: sdhi at ee100000 {\n" "> -\t\tcompatible = \"renesas,r8a7740-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a7740\";\n" "> \t\treg = <0xee100000 0x100>;\n" @@ -184,7 +174,7 @@ "> @@ -208,7 +208,7 @@\n" "> \n" "> \t/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */\n" - "> \tsdhi1: sdhi@ee120000 {\n" + "> \tsdhi1: sdhi at ee120000 {\n" "> -\t\tcompatible = \"renesas,r8a7740-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a7740\";\n" "> \t\treg = <0xee120000 0x100>;\n" @@ -193,7 +183,7 @@ "> @@ -219,7 +219,7 @@\n" "> \t};\n" "> \n" - "> \tsdhi2: sdhi@ee140000 {\n" + "> \tsdhi2: sdhi at ee140000 {\n" "> -\t\tcompatible = \"renesas,r8a7740-sdhi\";\n" "> +\t\tcompatible = \"renesas,sdhi-r8a7740\";\n" "> \t\treg = <0xee140000 0x100>;\n" @@ -233,4 +223,4 @@ "\n" Laurent Pinchart -565a6cec882fee638b7acd8da1dfd6c776edc6389c6bbec6cf2191693b1846b8 +712adc02e10f636bb9d8b15a97761c0eb14d28265a7def497430e80d4c82ed16
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.