diff for duplicates of <1507192201.8473.2.camel@pengutronix.de> diff --git a/a/1.txt b/N1/1.txt index 0575db8..c527a45 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Thu, 2017-10-05 at 11:30 +0900, Masahiro Yamada wrote: > Add basic reset data for Socionext's new SoC PXs3. > -> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> +> Signed-off-by: Masahiro Yamada <yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org> Thanks, applied to the reset/next branch. @@ -10,10 +10,10 @@ Philipp > --- > -> ?.../devicetree/bindings/reset/uniphier-reset.txt???|??3 +++ -> ?drivers/reset/reset-uniphier.c?????????????????????| 26 +> .../devicetree/bindings/reset/uniphier-reset.txt | 3 +++ +> drivers/reset/reset-uniphier.c | 26 > ++++++++++++++++++++++ -> ?2 files changed, 29 insertions(+) +> 2 files changed, 29 insertions(+) > > diff --git a/Documentation/devicetree/bindings/reset/uniphier- > reset.txt b/Documentation/devicetree/bindings/reset/uniphier-reset.txt @@ -21,29 +21,29 @@ Philipp > --- a/Documentation/devicetree/bindings/reset/uniphier-reset.txt > +++ b/Documentation/devicetree/bindings/reset/uniphier-reset.txt > @@ -13,6 +13,7 @@ Required properties: -> ?????"socionext,uniphier-pxs2-reset" - for PXs2/LD6b SoC -> ?????"socionext,uniphier-ld11-reset" - for LD11 SoC -> ?????"socionext,uniphier-ld20-reset" - for LD20 SoC -> +????"socionext,uniphier-pxs3-reset" - for PXs3 SoC -> ?- #reset-cells: should be 1. -> ? -> ?Example: +> "socionext,uniphier-pxs2-reset" - for PXs2/LD6b SoC +> "socionext,uniphier-ld11-reset" - for LD11 SoC +> "socionext,uniphier-ld20-reset" - for LD20 SoC +> + "socionext,uniphier-pxs3-reset" - for PXs3 SoC +> - #reset-cells: should be 1. +> +> Example: > @@ -44,6 +45,7 @@ Required properties: -> ?????"socionext,uniphier-ld11-mio-reset" - for LD11 SoC (MIO) -> ?????"socionext,uniphier-ld11-sd-reset"??- for LD11 SoC (SD) -> ?????"socionext,uniphier-ld20-sd-reset"??- for LD20 SoC -> +????"socionext,uniphier-pxs3-sd-reset"??- for PXs3 SoC -> ?- #reset-cells: should be 1. -> ? -> ?Example: +> "socionext,uniphier-ld11-mio-reset" - for LD11 SoC (MIO) +> "socionext,uniphier-ld11-sd-reset" - for LD11 SoC (SD) +> "socionext,uniphier-ld20-sd-reset" - for LD20 SoC +> + "socionext,uniphier-pxs3-sd-reset" - for PXs3 SoC +> - #reset-cells: should be 1. +> +> Example: > @@ -74,6 +76,7 @@ Required properties: -> ?????"socionext,uniphier-pxs2-peri-reset" - for PXs2/LD6b SoC -> ?????"socionext,uniphier-ld11-peri-reset" - for LD11 SoC -> ?????"socionext,uniphier-ld20-peri-reset" - for LD20 SoC -> +????"socionext,uniphier-pxs3-peri-reset" - for PXs3 SoC -> ?- #reset-cells: should be 1. -> ? -> ?Example: +> "socionext,uniphier-pxs2-peri-reset" - for PXs2/LD6b SoC +> "socionext,uniphier-ld11-peri-reset" - for LD11 SoC +> "socionext,uniphier-ld20-peri-reset" - for LD20 SoC +> + "socionext,uniphier-pxs3-peri-reset" - for PXs3 SoC +> - #reset-cells: should be 1. +> +> Example: > diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset- > uniphier.c > index bda2dd1..6ed808d 100644 @@ -51,9 +51,9 @@ Philipp > +++ b/drivers/reset/reset-uniphier.c > @@ -114,6 +114,20 @@ static const struct uniphier_reset_data > uniphier_ld20_sys_reset_data[] = { -> ? UNIPHIER_RESET_END, -> ?}; -> ? +> UNIPHIER_RESET_END, +> }; +> > +static const struct uniphier_reset_data > uniphier_pxs3_sys_reset_data[] = { > + UNIPHIER_RESETX(2, 0x200c, 0), /* NAND */ @@ -71,42 +71,46 @@ Philipp > + UNIPHIER_RESET_END, > +}; > + -> ?/* Media I/O reset data */ -> ?#define UNIPHIER_MIO_RESET_SD(id, ch) \ -> ? UNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0) +> /* Media I/O reset data */ +> #define UNIPHIER_MIO_RESET_SD(id, ch) \ +> UNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0) > @@ -359,6 +373,10 @@ static const struct of_device_id > uniphier_reset_match[] = { -> ? .compatible = "socionext,uniphier-ld20-reset", -> ? .data = uniphier_ld20_sys_reset_data, -> ? }, +> .compatible = "socionext,uniphier-ld20-reset", +> .data = uniphier_ld20_sys_reset_data, +> }, > + { > + .compatible = "socionext,uniphier-pxs3-reset", > + .data = uniphier_pxs3_sys_reset_data, > + }, -> ? /* Media I/O reset, SD reset */ -> ? { -> ? .compatible = "socionext,uniphier-ld4-mio-reset", +> /* Media I/O reset, SD reset */ +> { +> .compatible = "socionext,uniphier-ld4-mio-reset", > @@ -392,6 +410,10 @@ static const struct of_device_id > uniphier_reset_match[] = { -> ? .compatible = "socionext,uniphier-ld20-sd-reset", -> ? .data = uniphier_pro5_sd_reset_data, -> ? }, +> .compatible = "socionext,uniphier-ld20-sd-reset", +> .data = uniphier_pro5_sd_reset_data, +> }, > + { > + .compatible = "socionext,uniphier-pxs3-sd-reset", > + .data = uniphier_pro5_sd_reset_data, > + }, -> ? /* Peripheral reset */ -> ? { -> ? .compatible = "socionext,uniphier-ld4-peri-reset", +> /* Peripheral reset */ +> { +> .compatible = "socionext,uniphier-ld4-peri-reset", > @@ -421,6 +443,10 @@ static const struct of_device_id > uniphier_reset_match[] = { -> ? .compatible = "socionext,uniphier-ld20-peri-reset", -> ? .data = uniphier_pro4_peri_reset_data, -> ? }, +> .compatible = "socionext,uniphier-ld20-peri-reset", +> .data = uniphier_pro4_peri_reset_data, +> }, > + { > + .compatible = "socionext,uniphier-pxs3-peri-reset", > + .data = uniphier_pro4_peri_reset_data, > + }, -> ? /* Analog signal amplifiers reset */ -> ? { -> ? .compatible = "socionext,uniphier-ld11-adamv-reset", +> /* Analog signal amplifiers reset */ +> { +> .compatible = "socionext,uniphier-ld11-adamv-reset", +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 32da922..b6180bc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,20 @@ "ref\01507170657-26432-1-git-send-email-yamada.masahiro@socionext.com\0" - "From\0p.zabel@pengutronix.de (Philipp Zabel)\0" - "Subject\0[PATCH] reset: uniphier: add PXs3 reset data\0" + "ref\01507170657-26432-1-git-send-email-yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org\0" + "From\0Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0" + "Subject\0Re: [PATCH] reset: uniphier: add PXs3 reset data\0" "Date\0Thu, 05 Oct 2017 10:30:01 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Masahiro Yamada <yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>\0" + "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On Thu, 2017-10-05 at 11:30 +0900, Masahiro Yamada wrote:\n" "> Add basic reset data for Socionext's new SoC PXs3.\n" "> \n" - "> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>\n" + "> Signed-off-by: Masahiro Yamada <yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>\n" "\n" "Thanks, applied to the reset/next branch.\n" "\n" @@ -17,10 +23,10 @@ "\n" "> ---\n" "> \n" - "> ?.../devicetree/bindings/reset/uniphier-reset.txt???|??3 +++\n" - "> ?drivers/reset/reset-uniphier.c?????????????????????| 26\n" + "> \302\240.../devicetree/bindings/reset/uniphier-reset.txt\302\240\302\240\302\240|\302\240\302\2403 +++\n" + "> \302\240drivers/reset/reset-uniphier.c\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240| 26\n" "> ++++++++++++++++++++++\n" - "> ?2 files changed, 29 insertions(+)\n" + "> \302\2402 files changed, 29 insertions(+)\n" "> \n" "> diff --git a/Documentation/devicetree/bindings/reset/uniphier-\n" "> reset.txt b/Documentation/devicetree/bindings/reset/uniphier-reset.txt\n" @@ -28,29 +34,29 @@ "> --- a/Documentation/devicetree/bindings/reset/uniphier-reset.txt\n" "> +++ b/Documentation/devicetree/bindings/reset/uniphier-reset.txt\n" "> @@ -13,6 +13,7 @@ Required properties:\n" - "> ?????\"socionext,uniphier-pxs2-reset\" - for PXs2/LD6b SoC\n" - "> ?????\"socionext,uniphier-ld11-reset\" - for LD11 SoC\n" - "> ?????\"socionext,uniphier-ld20-reset\" - for LD20 SoC\n" - "> +????\"socionext,uniphier-pxs3-reset\" - for PXs3 SoC\n" - "> ?- #reset-cells: should be 1.\n" - "> ?\n" - "> ?Example:\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs2-reset\" - for PXs2/LD6b SoC\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld11-reset\" - for LD11 SoC\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld20-reset\" - for LD20 SoC\n" + "> +\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs3-reset\" - for PXs3 SoC\n" + "> \302\240- #reset-cells: should be 1.\n" + "> \302\240\n" + "> \302\240Example:\n" "> @@ -44,6 +45,7 @@ Required properties:\n" - "> ?????\"socionext,uniphier-ld11-mio-reset\" - for LD11 SoC (MIO)\n" - "> ?????\"socionext,uniphier-ld11-sd-reset\"??- for LD11 SoC (SD)\n" - "> ?????\"socionext,uniphier-ld20-sd-reset\"??- for LD20 SoC\n" - "> +????\"socionext,uniphier-pxs3-sd-reset\"??- for PXs3 SoC\n" - "> ?- #reset-cells: should be 1.\n" - "> ?\n" - "> ?Example:\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld11-mio-reset\" - for LD11 SoC (MIO)\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld11-sd-reset\"\302\240\302\240- for LD11 SoC (SD)\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld20-sd-reset\"\302\240\302\240- for LD20 SoC\n" + "> +\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs3-sd-reset\"\302\240\302\240- for PXs3 SoC\n" + "> \302\240- #reset-cells: should be 1.\n" + "> \302\240\n" + "> \302\240Example:\n" "> @@ -74,6 +76,7 @@ Required properties:\n" - "> ?????\"socionext,uniphier-pxs2-peri-reset\" - for PXs2/LD6b SoC\n" - "> ?????\"socionext,uniphier-ld11-peri-reset\" - for LD11 SoC\n" - "> ?????\"socionext,uniphier-ld20-peri-reset\" - for LD20 SoC\n" - "> +????\"socionext,uniphier-pxs3-peri-reset\" - for PXs3 SoC\n" - "> ?- #reset-cells: should be 1.\n" - "> ?\n" - "> ?Example:\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs2-peri-reset\" - for PXs2/LD6b SoC\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld11-peri-reset\" - for LD11 SoC\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld20-peri-reset\" - for LD20 SoC\n" + "> +\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs3-peri-reset\" - for PXs3 SoC\n" + "> \302\240- #reset-cells: should be 1.\n" + "> \302\240\n" + "> \302\240Example:\n" "> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-\n" "> uniphier.c\n" "> index bda2dd1..6ed808d 100644\n" @@ -58,9 +64,9 @@ "> +++ b/drivers/reset/reset-uniphier.c\n" "> @@ -114,6 +114,20 @@ static const struct uniphier_reset_data\n" "> uniphier_ld20_sys_reset_data[] = {\n" - "> ?\tUNIPHIER_RESET_END,\n" - "> ?};\n" - "> ?\n" + "> \302\240\tUNIPHIER_RESET_END,\n" + "> \302\240};\n" + "> \302\240\n" "> +static const struct uniphier_reset_data\n" "> uniphier_pxs3_sys_reset_data[] = {\n" "> +\tUNIPHIER_RESETX(2, 0x200c, 0),\t\t/* NAND */\n" @@ -78,44 +84,48 @@ "> +\tUNIPHIER_RESET_END,\n" "> +};\n" "> +\n" - "> ?/* Media I/O reset data */\n" - "> ?#define UNIPHIER_MIO_RESET_SD(id, ch)\t\t\t\\\n" - "> ?\tUNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0)\n" + "> \302\240/* Media I/O reset data */\n" + "> \302\240#define UNIPHIER_MIO_RESET_SD(id, ch)\t\t\t\\\n" + "> \302\240\tUNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0)\n" "> @@ -359,6 +373,10 @@ static const struct of_device_id\n" "> uniphier_reset_match[] = {\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld20-reset\",\n" - "> ?\t\t.data = uniphier_ld20_sys_reset_data,\n" - "> ?\t},\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld20-reset\",\n" + "> \302\240\t\t.data = uniphier_ld20_sys_reset_data,\n" + "> \302\240\t},\n" "> +\t{\n" "> +\t\t.compatible = \"socionext,uniphier-pxs3-reset\",\n" "> +\t\t.data = uniphier_pxs3_sys_reset_data,\n" "> +\t},\n" - "> ?\t/* Media I/O reset, SD reset */\n" - "> ?\t{\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld4-mio-reset\",\n" + "> \302\240\t/* Media I/O reset, SD reset */\n" + "> \302\240\t{\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld4-mio-reset\",\n" "> @@ -392,6 +410,10 @@ static const struct of_device_id\n" "> uniphier_reset_match[] = {\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld20-sd-reset\",\n" - "> ?\t\t.data = uniphier_pro5_sd_reset_data,\n" - "> ?\t},\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld20-sd-reset\",\n" + "> \302\240\t\t.data = uniphier_pro5_sd_reset_data,\n" + "> \302\240\t},\n" "> +\t{\n" "> +\t\t.compatible = \"socionext,uniphier-pxs3-sd-reset\",\n" "> +\t\t.data = uniphier_pro5_sd_reset_data,\n" "> +\t},\n" - "> ?\t/* Peripheral reset */\n" - "> ?\t{\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld4-peri-reset\",\n" + "> \302\240\t/* Peripheral reset */\n" + "> \302\240\t{\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld4-peri-reset\",\n" "> @@ -421,6 +443,10 @@ static const struct of_device_id\n" "> uniphier_reset_match[] = {\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld20-peri-reset\",\n" - "> ?\t\t.data = uniphier_pro4_peri_reset_data,\n" - "> ?\t},\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld20-peri-reset\",\n" + "> \302\240\t\t.data = uniphier_pro4_peri_reset_data,\n" + "> \302\240\t},\n" "> +\t{\n" "> +\t\t.compatible = \"socionext,uniphier-pxs3-peri-reset\",\n" "> +\t\t.data = uniphier_pro4_peri_reset_data,\n" "> +\t},\n" - "> ?\t/* Analog signal amplifiers reset */\n" - "> ?\t{\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld11-adamv-reset\"," + "> \302\240\t/* Analog signal amplifiers reset */\n" + "> \302\240\t{\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld11-adamv-reset\",\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -c6413430e293913e78ae4f193eb0d4b6723c8671d4cafcf2f39e06610dd97635 +5e96ad6c468926967db432d711afae716b43f736c5afc1d63072a33b957f936c
diff --git a/a/1.txt b/N2/1.txt index 0575db8..13852b3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -10,10 +10,10 @@ Philipp > --- > -> ?.../devicetree/bindings/reset/uniphier-reset.txt???|??3 +++ -> ?drivers/reset/reset-uniphier.c?????????????????????| 26 +> .../devicetree/bindings/reset/uniphier-reset.txt | 3 +++ +> drivers/reset/reset-uniphier.c | 26 > ++++++++++++++++++++++ -> ?2 files changed, 29 insertions(+) +> 2 files changed, 29 insertions(+) > > diff --git a/Documentation/devicetree/bindings/reset/uniphier- > reset.txt b/Documentation/devicetree/bindings/reset/uniphier-reset.txt @@ -21,29 +21,29 @@ Philipp > --- a/Documentation/devicetree/bindings/reset/uniphier-reset.txt > +++ b/Documentation/devicetree/bindings/reset/uniphier-reset.txt > @@ -13,6 +13,7 @@ Required properties: -> ?????"socionext,uniphier-pxs2-reset" - for PXs2/LD6b SoC -> ?????"socionext,uniphier-ld11-reset" - for LD11 SoC -> ?????"socionext,uniphier-ld20-reset" - for LD20 SoC -> +????"socionext,uniphier-pxs3-reset" - for PXs3 SoC -> ?- #reset-cells: should be 1. -> ? -> ?Example: +> "socionext,uniphier-pxs2-reset" - for PXs2/LD6b SoC +> "socionext,uniphier-ld11-reset" - for LD11 SoC +> "socionext,uniphier-ld20-reset" - for LD20 SoC +> + "socionext,uniphier-pxs3-reset" - for PXs3 SoC +> - #reset-cells: should be 1. +> +> Example: > @@ -44,6 +45,7 @@ Required properties: -> ?????"socionext,uniphier-ld11-mio-reset" - for LD11 SoC (MIO) -> ?????"socionext,uniphier-ld11-sd-reset"??- for LD11 SoC (SD) -> ?????"socionext,uniphier-ld20-sd-reset"??- for LD20 SoC -> +????"socionext,uniphier-pxs3-sd-reset"??- for PXs3 SoC -> ?- #reset-cells: should be 1. -> ? -> ?Example: +> "socionext,uniphier-ld11-mio-reset" - for LD11 SoC (MIO) +> "socionext,uniphier-ld11-sd-reset" - for LD11 SoC (SD) +> "socionext,uniphier-ld20-sd-reset" - for LD20 SoC +> + "socionext,uniphier-pxs3-sd-reset" - for PXs3 SoC +> - #reset-cells: should be 1. +> +> Example: > @@ -74,6 +76,7 @@ Required properties: -> ?????"socionext,uniphier-pxs2-peri-reset" - for PXs2/LD6b SoC -> ?????"socionext,uniphier-ld11-peri-reset" - for LD11 SoC -> ?????"socionext,uniphier-ld20-peri-reset" - for LD20 SoC -> +????"socionext,uniphier-pxs3-peri-reset" - for PXs3 SoC -> ?- #reset-cells: should be 1. -> ? -> ?Example: +> "socionext,uniphier-pxs2-peri-reset" - for PXs2/LD6b SoC +> "socionext,uniphier-ld11-peri-reset" - for LD11 SoC +> "socionext,uniphier-ld20-peri-reset" - for LD20 SoC +> + "socionext,uniphier-pxs3-peri-reset" - for PXs3 SoC +> - #reset-cells: should be 1. +> +> Example: > diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset- > uniphier.c > index bda2dd1..6ed808d 100644 @@ -51,9 +51,9 @@ Philipp > +++ b/drivers/reset/reset-uniphier.c > @@ -114,6 +114,20 @@ static const struct uniphier_reset_data > uniphier_ld20_sys_reset_data[] = { -> ? UNIPHIER_RESET_END, -> ?}; -> ? +> UNIPHIER_RESET_END, +> }; +> > +static const struct uniphier_reset_data > uniphier_pxs3_sys_reset_data[] = { > + UNIPHIER_RESETX(2, 0x200c, 0), /* NAND */ @@ -71,42 +71,42 @@ Philipp > + UNIPHIER_RESET_END, > +}; > + -> ?/* Media I/O reset data */ -> ?#define UNIPHIER_MIO_RESET_SD(id, ch) \ -> ? UNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0) +> /* Media I/O reset data */ +> #define UNIPHIER_MIO_RESET_SD(id, ch) \ +> UNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0) > @@ -359,6 +373,10 @@ static const struct of_device_id > uniphier_reset_match[] = { -> ? .compatible = "socionext,uniphier-ld20-reset", -> ? .data = uniphier_ld20_sys_reset_data, -> ? }, +> .compatible = "socionext,uniphier-ld20-reset", +> .data = uniphier_ld20_sys_reset_data, +> }, > + { > + .compatible = "socionext,uniphier-pxs3-reset", > + .data = uniphier_pxs3_sys_reset_data, > + }, -> ? /* Media I/O reset, SD reset */ -> ? { -> ? .compatible = "socionext,uniphier-ld4-mio-reset", +> /* Media I/O reset, SD reset */ +> { +> .compatible = "socionext,uniphier-ld4-mio-reset", > @@ -392,6 +410,10 @@ static const struct of_device_id > uniphier_reset_match[] = { -> ? .compatible = "socionext,uniphier-ld20-sd-reset", -> ? .data = uniphier_pro5_sd_reset_data, -> ? }, +> .compatible = "socionext,uniphier-ld20-sd-reset", +> .data = uniphier_pro5_sd_reset_data, +> }, > + { > + .compatible = "socionext,uniphier-pxs3-sd-reset", > + .data = uniphier_pro5_sd_reset_data, > + }, -> ? /* Peripheral reset */ -> ? { -> ? .compatible = "socionext,uniphier-ld4-peri-reset", +> /* Peripheral reset */ +> { +> .compatible = "socionext,uniphier-ld4-peri-reset", > @@ -421,6 +443,10 @@ static const struct of_device_id > uniphier_reset_match[] = { -> ? .compatible = "socionext,uniphier-ld20-peri-reset", -> ? .data = uniphier_pro4_peri_reset_data, -> ? }, +> .compatible = "socionext,uniphier-ld20-peri-reset", +> .data = uniphier_pro4_peri_reset_data, +> }, > + { > + .compatible = "socionext,uniphier-pxs3-peri-reset", > + .data = uniphier_pro4_peri_reset_data, > + }, -> ? /* Analog signal amplifiers reset */ -> ? { -> ? .compatible = "socionext,uniphier-ld11-adamv-reset", +> /* Analog signal amplifiers reset */ +> { +> .compatible = "socionext,uniphier-ld11-adamv-reset", diff --git a/a/content_digest b/N2/content_digest index 32da922..5258ee4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,13 @@ "ref\01507170657-26432-1-git-send-email-yamada.masahiro@socionext.com\0" - "From\0p.zabel@pengutronix.de (Philipp Zabel)\0" - "Subject\0[PATCH] reset: uniphier: add PXs3 reset data\0" + "From\0Philipp Zabel <p.zabel@pengutronix.de>\0" + "Subject\0Re: [PATCH] reset: uniphier: add PXs3 reset data\0" "Date\0Thu, 05 Oct 2017 10:30:01 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Masahiro Yamada <yamada.masahiro@socionext.com>\0" + "Cc\0devicetree@vger.kernel.org" + linux-kernel@vger.kernel.org + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, 2017-10-05 at 11:30 +0900, Masahiro Yamada wrote:\n" @@ -17,10 +22,10 @@ "\n" "> ---\n" "> \n" - "> ?.../devicetree/bindings/reset/uniphier-reset.txt???|??3 +++\n" - "> ?drivers/reset/reset-uniphier.c?????????????????????| 26\n" + "> \302\240.../devicetree/bindings/reset/uniphier-reset.txt\302\240\302\240\302\240|\302\240\302\2403 +++\n" + "> \302\240drivers/reset/reset-uniphier.c\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240| 26\n" "> ++++++++++++++++++++++\n" - "> ?2 files changed, 29 insertions(+)\n" + "> \302\2402 files changed, 29 insertions(+)\n" "> \n" "> diff --git a/Documentation/devicetree/bindings/reset/uniphier-\n" "> reset.txt b/Documentation/devicetree/bindings/reset/uniphier-reset.txt\n" @@ -28,29 +33,29 @@ "> --- a/Documentation/devicetree/bindings/reset/uniphier-reset.txt\n" "> +++ b/Documentation/devicetree/bindings/reset/uniphier-reset.txt\n" "> @@ -13,6 +13,7 @@ Required properties:\n" - "> ?????\"socionext,uniphier-pxs2-reset\" - for PXs2/LD6b SoC\n" - "> ?????\"socionext,uniphier-ld11-reset\" - for LD11 SoC\n" - "> ?????\"socionext,uniphier-ld20-reset\" - for LD20 SoC\n" - "> +????\"socionext,uniphier-pxs3-reset\" - for PXs3 SoC\n" - "> ?- #reset-cells: should be 1.\n" - "> ?\n" - "> ?Example:\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs2-reset\" - for PXs2/LD6b SoC\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld11-reset\" - for LD11 SoC\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld20-reset\" - for LD20 SoC\n" + "> +\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs3-reset\" - for PXs3 SoC\n" + "> \302\240- #reset-cells: should be 1.\n" + "> \302\240\n" + "> \302\240Example:\n" "> @@ -44,6 +45,7 @@ Required properties:\n" - "> ?????\"socionext,uniphier-ld11-mio-reset\" - for LD11 SoC (MIO)\n" - "> ?????\"socionext,uniphier-ld11-sd-reset\"??- for LD11 SoC (SD)\n" - "> ?????\"socionext,uniphier-ld20-sd-reset\"??- for LD20 SoC\n" - "> +????\"socionext,uniphier-pxs3-sd-reset\"??- for PXs3 SoC\n" - "> ?- #reset-cells: should be 1.\n" - "> ?\n" - "> ?Example:\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld11-mio-reset\" - for LD11 SoC (MIO)\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld11-sd-reset\"\302\240\302\240- for LD11 SoC (SD)\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld20-sd-reset\"\302\240\302\240- for LD20 SoC\n" + "> +\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs3-sd-reset\"\302\240\302\240- for PXs3 SoC\n" + "> \302\240- #reset-cells: should be 1.\n" + "> \302\240\n" + "> \302\240Example:\n" "> @@ -74,6 +76,7 @@ Required properties:\n" - "> ?????\"socionext,uniphier-pxs2-peri-reset\" - for PXs2/LD6b SoC\n" - "> ?????\"socionext,uniphier-ld11-peri-reset\" - for LD11 SoC\n" - "> ?????\"socionext,uniphier-ld20-peri-reset\" - for LD20 SoC\n" - "> +????\"socionext,uniphier-pxs3-peri-reset\" - for PXs3 SoC\n" - "> ?- #reset-cells: should be 1.\n" - "> ?\n" - "> ?Example:\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs2-peri-reset\" - for PXs2/LD6b SoC\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld11-peri-reset\" - for LD11 SoC\n" + "> \302\240\302\240\302\240\302\240\302\240\"socionext,uniphier-ld20-peri-reset\" - for LD20 SoC\n" + "> +\302\240\302\240\302\240\302\240\"socionext,uniphier-pxs3-peri-reset\" - for PXs3 SoC\n" + "> \302\240- #reset-cells: should be 1.\n" + "> \302\240\n" + "> \302\240Example:\n" "> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-\n" "> uniphier.c\n" "> index bda2dd1..6ed808d 100644\n" @@ -58,9 +63,9 @@ "> +++ b/drivers/reset/reset-uniphier.c\n" "> @@ -114,6 +114,20 @@ static const struct uniphier_reset_data\n" "> uniphier_ld20_sys_reset_data[] = {\n" - "> ?\tUNIPHIER_RESET_END,\n" - "> ?};\n" - "> ?\n" + "> \302\240\tUNIPHIER_RESET_END,\n" + "> \302\240};\n" + "> \302\240\n" "> +static const struct uniphier_reset_data\n" "> uniphier_pxs3_sys_reset_data[] = {\n" "> +\tUNIPHIER_RESETX(2, 0x200c, 0),\t\t/* NAND */\n" @@ -78,44 +83,44 @@ "> +\tUNIPHIER_RESET_END,\n" "> +};\n" "> +\n" - "> ?/* Media I/O reset data */\n" - "> ?#define UNIPHIER_MIO_RESET_SD(id, ch)\t\t\t\\\n" - "> ?\tUNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0)\n" + "> \302\240/* Media I/O reset data */\n" + "> \302\240#define UNIPHIER_MIO_RESET_SD(id, ch)\t\t\t\\\n" + "> \302\240\tUNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0)\n" "> @@ -359,6 +373,10 @@ static const struct of_device_id\n" "> uniphier_reset_match[] = {\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld20-reset\",\n" - "> ?\t\t.data = uniphier_ld20_sys_reset_data,\n" - "> ?\t},\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld20-reset\",\n" + "> \302\240\t\t.data = uniphier_ld20_sys_reset_data,\n" + "> \302\240\t},\n" "> +\t{\n" "> +\t\t.compatible = \"socionext,uniphier-pxs3-reset\",\n" "> +\t\t.data = uniphier_pxs3_sys_reset_data,\n" "> +\t},\n" - "> ?\t/* Media I/O reset, SD reset */\n" - "> ?\t{\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld4-mio-reset\",\n" + "> \302\240\t/* Media I/O reset, SD reset */\n" + "> \302\240\t{\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld4-mio-reset\",\n" "> @@ -392,6 +410,10 @@ static const struct of_device_id\n" "> uniphier_reset_match[] = {\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld20-sd-reset\",\n" - "> ?\t\t.data = uniphier_pro5_sd_reset_data,\n" - "> ?\t},\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld20-sd-reset\",\n" + "> \302\240\t\t.data = uniphier_pro5_sd_reset_data,\n" + "> \302\240\t},\n" "> +\t{\n" "> +\t\t.compatible = \"socionext,uniphier-pxs3-sd-reset\",\n" "> +\t\t.data = uniphier_pro5_sd_reset_data,\n" "> +\t},\n" - "> ?\t/* Peripheral reset */\n" - "> ?\t{\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld4-peri-reset\",\n" + "> \302\240\t/* Peripheral reset */\n" + "> \302\240\t{\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld4-peri-reset\",\n" "> @@ -421,6 +443,10 @@ static const struct of_device_id\n" "> uniphier_reset_match[] = {\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld20-peri-reset\",\n" - "> ?\t\t.data = uniphier_pro4_peri_reset_data,\n" - "> ?\t},\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld20-peri-reset\",\n" + "> \302\240\t\t.data = uniphier_pro4_peri_reset_data,\n" + "> \302\240\t},\n" "> +\t{\n" "> +\t\t.compatible = \"socionext,uniphier-pxs3-peri-reset\",\n" "> +\t\t.data = uniphier_pro4_peri_reset_data,\n" "> +\t},\n" - "> ?\t/* Analog signal amplifiers reset */\n" - "> ?\t{\n" - "> ?\t\t.compatible = \"socionext,uniphier-ld11-adamv-reset\"," + "> \302\240\t/* Analog signal amplifiers reset */\n" + "> \302\240\t{\n" + "> \302\240\t\t.compatible = \"socionext,uniphier-ld11-adamv-reset\"," -c6413430e293913e78ae4f193eb0d4b6723c8671d4cafcf2f39e06610dd97635 +a386d18b81c3d1ec078506255fccf391b7f38941858318bfc28e1d44fcf034e9
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.