diff for duplicates of <1711141.qqk6hopDLW@avalon> diff --git a/a/1.txt b/N1/1.txt index 810011f..0fa58ec 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ I don't mind submitting a v4. > > Set the gpio_chip device field to the PFC device to enable automatic > > GPIO OF support. > > -> > Cc: devicetree-discuss@lists.ozlabs.org +> > Cc: devicetree-discuss at lists.ozlabs.org > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > --- @@ -154,7 +154,7 @@ configuration nodes. > > + > > +Example 1: SH73A0 (SH-Mobile AG5) pin controller node > > + -> > + pfc: pfc@e6050000 { +> > + pfc: pfc at e6050000 { > > + compatible = "renesas,pfc-sh73a0"; > > + reg = <0xe6050000 0x8000>, > > + <0xe605801c 0x1c>; @@ -283,7 +283,7 @@ as we don't use it anymore. > > + > > -> > if (info = NULL) +> > if (info == NULL) > > > > return -ENODEV; > @@ -312,13 +312,13 @@ as we don't use it anymore. > > + > > + /* If no mapping has been found in child nodes try the config node. */ -> > + if (*num_maps = 0) { +> > + if (*num_maps == 0) { > > + ret = sh_pfc_dt_subnode_to_map(dev, np, map, num_maps, &index); > > + if (ret < 0) > > + goto done; > > + } > > + -> > + if (*num_maps = 0) { +> > + if (*num_maps == 0) { > > + dev_err(dev, "no mapping found in node %s\n", np->full_name); > > + ret = -EINVAL; > > + goto done; diff --git a/a/content_digest b/N1/content_digest index d586a59..0c87173 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01368577100-3530-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\01368577100-3530-2-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\0Pine.LNX.4.64.1305151417300.10596@axis700.grange\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v3 01/20] sh-pfc: Add DT support\0" - "Date\0Thu, 16 May 2013 11:53:25 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v3 01/20] sh-pfc: Add DT support\0" + "Date\0Thu, 16 May 2013 13:53:25 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -31,7 +31,7 @@ "> > Set the gpio_chip device field to the PFC device to enable automatic\n" "> > GPIO OF support.\n" "> > \n" - "> > Cc: devicetree-discuss@lists.ozlabs.org\n" + "> > Cc: devicetree-discuss at lists.ozlabs.org\n" "> > Signed-off-by: Laurent Pinchart\n" "> > <laurent.pinchart+renesas@ideasonboard.com>\n" "> > ---\n" @@ -163,7 +163,7 @@ "> > +\n" "> > +Example 1: SH73A0 (SH-Mobile AG5) pin controller node\n" "> > +\n" - "> > +\tpfc: pfc@e6050000 {\n" + "> > +\tpfc: pfc at e6050000 {\n" "> > +\t\tcompatible = \"renesas,pfc-sh73a0\";\n" "> > +\t\treg = <0xe6050000 0x8000>,\n" "> > +\t\t <0xe605801c 0x1c>;\n" @@ -292,7 +292,7 @@ "\n" "> > +\n" "> > \n" - "> > \tif (info = NULL)\n" + "> > \tif (info == NULL)\n" "> > \t\n" "> > \t\treturn -ENODEV;\n" "> \n" @@ -321,13 +321,13 @@ "> > +\n" "> > +\t/* If no mapping has been found in child nodes try the config node. \n" "*/\n" - "> > +\tif (*num_maps = 0) {\n" + "> > +\tif (*num_maps == 0) {\n" "> > +\t\tret = sh_pfc_dt_subnode_to_map(dev, np, map, num_maps, &index);\n" "> > +\t\tif (ret < 0)\n" "> > +\t\t\tgoto done;\n" "> > +\t}\n" "> > +\n" - "> > +\tif (*num_maps = 0) {\n" + "> > +\tif (*num_maps == 0) {\n" "> > +\t\tdev_err(dev, \"no mapping found in node %s\\n\", np->full_name);\n" "> > +\t\tret = -EINVAL;\n" "> > +\t\tgoto done;\n" @@ -362,4 +362,4 @@ "\n" Laurent Pinchart -3864a2c1240adbba4b5c8dfb8ea281d96dd7f5d56478a3057525058539cd083c +a0a46228f7010ef700745c4232490ae443d5fde4ede1c0f86d54a7c05026e741
diff --git a/a/1.txt b/N2/1.txt index 810011f..843f8f4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -283,7 +283,7 @@ as we don't use it anymore. > > + > > -> > if (info = NULL) +> > if (info == NULL) > > > > return -ENODEV; > @@ -312,13 +312,13 @@ as we don't use it anymore. > > + > > + /* If no mapping has been found in child nodes try the config node. */ -> > + if (*num_maps = 0) { +> > + if (*num_maps == 0) { > > + ret = sh_pfc_dt_subnode_to_map(dev, np, map, num_maps, &index); > > + if (ret < 0) > > + goto done; > > + } > > + -> > + if (*num_maps = 0) { +> > + if (*num_maps == 0) { > > + dev_err(dev, "no mapping found in node %s\n", np->full_name); > > + ret = -EINVAL; > > + goto done; diff --git a/a/content_digest b/N2/content_digest index d586a59..3d7ce98 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,15 @@ "ref\0Pine.LNX.4.64.1305151417300.10596@axis700.grange\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v3 01/20] sh-pfc: Add DT support\0" - "Date\0Thu, 16 May 2013 11:53:25 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 16 May 2013 13:53:25 +0200\0" + "To\0Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" + "Cc\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>" + linux-sh@vger.kernel.org + devicetree-discuss@lists.ozlabs.org + linux-arm-kernel@lists.infradead.org + Linus Walleij <linus.walleij@linaro.org> + Magnus Damm <magnus.damm@gmail.com> + " Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>\0" "\00:1\0" "b\0" "Hi Guennadi,\n" @@ -292,7 +299,7 @@ "\n" "> > +\n" "> > \n" - "> > \tif (info = NULL)\n" + "> > \tif (info == NULL)\n" "> > \t\n" "> > \t\treturn -ENODEV;\n" "> \n" @@ -321,13 +328,13 @@ "> > +\n" "> > +\t/* If no mapping has been found in child nodes try the config node. \n" "*/\n" - "> > +\tif (*num_maps = 0) {\n" + "> > +\tif (*num_maps == 0) {\n" "> > +\t\tret = sh_pfc_dt_subnode_to_map(dev, np, map, num_maps, &index);\n" "> > +\t\tif (ret < 0)\n" "> > +\t\t\tgoto done;\n" "> > +\t}\n" "> > +\n" - "> > +\tif (*num_maps = 0) {\n" + "> > +\tif (*num_maps == 0) {\n" "> > +\t\tdev_err(dev, \"no mapping found in node %s\\n\", np->full_name);\n" "> > +\t\tret = -EINVAL;\n" "> > +\t\tgoto done;\n" @@ -362,4 +369,4 @@ "\n" Laurent Pinchart -3864a2c1240adbba4b5c8dfb8ea281d96dd7f5d56478a3057525058539cd083c +a53cc5a70fb6aeddd351e89b349040b7f2b99de3bb068fc6224a1442c733c128
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.