diff for duplicates of <20130612114911.638683E0A56@localhost> diff --git a/a/1.txt b/N1/1.txt index e94efab..3eefa4c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Tue, 21 May 2013 13:40:06 +0200, Laurent Pinchart <laurent.pinchart+renesas@i > Add DT bindings for the gpio-rcar driver and read the device > configuration from the DT node at probe time if available. > -> Cc: devicetree-discuss@lists.ozlabs.org +> Cc: devicetree-discuss at lists.ozlabs.org > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 52 +++++++++++++++++ @@ -49,7 +49,7 @@ On Tue, 21 May 2013 13:40:06 +0200, Laurent Pinchart <laurent.pinchart+renesas@i > + > +Example: R8A7779 (R-Car H1) GPIO controller nodes > + -> + gpio0: gpio@ffc40000 { +> + gpio0: gpio at ffc40000 { > + compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; > + reg = <0xffc40000 0x2c>; > + interrupt-parent = <&gic>; @@ -59,7 +59,7 @@ On Tue, 21 May 2013 13:40:06 +0200, Laurent Pinchart <laurent.pinchart+renesas@i > + gpio-ranges = <&pfc 0 0 32>; > + }; > + ... -> + gpio6: gpio@ffc46000 { +> + gpio6: gpio at ffc46000 { > + compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; > + reg = <0xffc46000 0x2c>; > + interrupt-parent = <&gic>; @@ -108,14 +108,14 @@ block so that you can use the above construct. > + ret = of_parse_phandle_with_args(np, "gpio-ranges", > + "#gpio-range-cells", 0, &args); -> + p->config.number_of_pins = ret = 0 && args.args_count = 3 +> + p->config.number_of_pins = ret == 0 && args.args_count == 3 > + ? args.args[2] > + : RCAR_MAX_GPIO_PER_BANK; > + p->config.gpio_base = -1; > + } > +#endif > + -> + if (p->config.number_of_pins = 0 || +> + if (p->config.number_of_pins == 0 || > + p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) { > + dev_warn(&p->pdev->dev, > + "Invalid number of gpio lines %u, using %u\n", @@ -203,7 +203,7 @@ block so that you can use the above construct. > > _______________________________________________ > devicetree-discuss mailing list -> devicetree-discuss@lists.ozlabs.org +> devicetree-discuss at lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss -- diff --git a/a/content_digest b/N1/content_digest index 005ced7..ee7960b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01369136406-23800-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\01369136406-23800-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" - "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0Re: [RFC/PATCH v2 2/2] gpio-rcar: Add DT support\0" - "Date\0Wed, 12 Jun 2013 11:49:11 +0000\0" + "From\0grant.likely@secretlab.ca (Grant Likely)\0" + "Subject\0[RFC/PATCH v2 2/2] gpio-rcar: Add DT support\0" + "Date\0Wed, 12 Jun 2013 12:49:11 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -10,7 +10,7 @@ "> Add DT bindings for the gpio-rcar driver and read the device\n" "> configuration from the DT node at probe time if available.\n" "> \n" - "> Cc: devicetree-discuss@lists.ozlabs.org\n" + "> Cc: devicetree-discuss at lists.ozlabs.org\n" "> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\n" "> ---\n" "> .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 52 +++++++++++++++++\n" @@ -57,7 +57,7 @@ "> +\n" "> +Example: R8A7779 (R-Car H1) GPIO controller nodes\n" "> +\n" - "> +\tgpio0: gpio@ffc40000 {\n" + "> +\tgpio0: gpio at ffc40000 {\n" "> +\t\tcompatible = \"renesas,gpio-r8a7779\", \"renesas,gpio-rcar\";\n" "> +\t\treg = <0xffc40000 0x2c>;\n" "> +\t\tinterrupt-parent = <&gic>;\n" @@ -67,7 +67,7 @@ "> +\t\tgpio-ranges = <&pfc 0 0 32>;\n" "> +\t};\n" "> +\t...\n" - "> +\tgpio6: gpio@ffc46000 {\n" + "> +\tgpio6: gpio at ffc46000 {\n" "> +\t\tcompatible = \"renesas,gpio-r8a7779\", \"renesas,gpio-rcar\";\n" "> +\t\treg = <0xffc46000 0x2c>;\n" "> +\t\tinterrupt-parent = <&gic>;\n" @@ -116,14 +116,14 @@ "\n" "> +\t\tret = of_parse_phandle_with_args(np, \"gpio-ranges\",\n" "> +\t\t\t\t\"#gpio-range-cells\", 0, &args);\n" - "> +\t\tp->config.number_of_pins = ret = 0 && args.args_count = 3\n" + "> +\t\tp->config.number_of_pins = ret == 0 && args.args_count == 3\n" "> +\t\t\t\t\t ? args.args[2]\n" "> +\t\t\t\t\t : RCAR_MAX_GPIO_PER_BANK;\n" "> +\t\tp->config.gpio_base = -1;\n" "> +\t}\n" "> +#endif\n" "> +\n" - "> +\tif (p->config.number_of_pins = 0 ||\n" + "> +\tif (p->config.number_of_pins == 0 ||\n" "> +\t p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) {\n" "> +\t\tdev_warn(&p->pdev->dev,\n" "> +\t\t\t \"Invalid number of gpio lines %u, using %u\\n\",\n" @@ -211,11 +211,11 @@ "> \n" "> _______________________________________________\n" "> devicetree-discuss mailing list\n" - "> devicetree-discuss@lists.ozlabs.org\n" + "> devicetree-discuss at lists.ozlabs.org\n" "> https://lists.ozlabs.org/listinfo/devicetree-discuss\n" "\n" "-- \n" "Grant Likely, B.Sc, P.Eng.\n" Secret Lab Technologies, Ltd. -80d1c209b65aca393ecd247e0e61eaf370de324cc8d84936177c3d6cdfc30f4f +91453064594c7275306212076893ad73b42624ad2cd5ed8f1950459755f4d17e
diff --git a/a/1.txt b/N2/1.txt index e94efab..900dd3c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -108,14 +108,14 @@ block so that you can use the above construct. > + ret = of_parse_phandle_with_args(np, "gpio-ranges", > + "#gpio-range-cells", 0, &args); -> + p->config.number_of_pins = ret = 0 && args.args_count = 3 +> + p->config.number_of_pins = ret == 0 && args.args_count == 3 > + ? args.args[2] > + : RCAR_MAX_GPIO_PER_BANK; > + p->config.gpio_base = -1; > + } > +#endif > + -> + if (p->config.number_of_pins = 0 || +> + if (p->config.number_of_pins == 0 || > + p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) { > + dev_warn(&p->pdev->dev, > + "Invalid number of gpio lines %u, using %u\n", diff --git a/a/content_digest b/N2/content_digest index 005ced7..e927893 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,13 @@ "ref\01369136406-23800-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0Re: [RFC/PATCH v2 2/2] gpio-rcar: Add DT support\0" - "Date\0Wed, 12 Jun 2013 11:49:11 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 12 Jun 2013 12:49:11 +0100\0" + "To\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>" + " linux-sh@vger.kernel.org\0" + "Cc\0Magnus Damm <damm@opensource.se>" + devicetree-discuss@lists.ozlabs.org + linux-arm-kernel@lists.infradead.org + " Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" "\00:1\0" "b\0" "On Tue, 21 May 2013 13:40:06 +0200, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> wrote:\n" @@ -116,14 +121,14 @@ "\n" "> +\t\tret = of_parse_phandle_with_args(np, \"gpio-ranges\",\n" "> +\t\t\t\t\"#gpio-range-cells\", 0, &args);\n" - "> +\t\tp->config.number_of_pins = ret = 0 && args.args_count = 3\n" + "> +\t\tp->config.number_of_pins = ret == 0 && args.args_count == 3\n" "> +\t\t\t\t\t ? args.args[2]\n" "> +\t\t\t\t\t : RCAR_MAX_GPIO_PER_BANK;\n" "> +\t\tp->config.gpio_base = -1;\n" "> +\t}\n" "> +#endif\n" "> +\n" - "> +\tif (p->config.number_of_pins = 0 ||\n" + "> +\tif (p->config.number_of_pins == 0 ||\n" "> +\t p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) {\n" "> +\t\tdev_warn(&p->pdev->dev,\n" "> +\t\t\t \"Invalid number of gpio lines %u, using %u\\n\",\n" @@ -218,4 +223,4 @@ "Grant Likely, B.Sc, P.Eng.\n" Secret Lab Technologies, Ltd. -80d1c209b65aca393ecd247e0e61eaf370de324cc8d84936177c3d6cdfc30f4f +bf92b9cbf945bd3a9e3a553cfb0aa700d6180656605c977773e3f0c0493c30b7
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.