diff for duplicates of <1531576208.2831.1@smtp.crapouillou.net> diff --git a/a/1.txt b/N1/1.txt index 92fe91b..20d1cde 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,12 @@ -Le sam. 14 juil. 2018 =E0 15:32, Alexandre Belloni=20 -<alexandre.belloni@bootlin.com> a =E9crit : +Le sam. 14 juil. 2018 à 15:32, Alexandre Belloni +<alexandre.belloni@bootlin.com> a écrit : > On 14/07/2018 15:25:33+0200, Paul Cercueil wrote: >> Hi Alexandre, ->>=20 ->> Le sam. 14 juil. 2018 =E0 15:19, Alexandre Belloni ->> <alexandre.belloni@bootlin.com> a =E9crit : +>> +>> Le sam. 14 juil. 2018 à 15:19, Alexandre Belloni +>> <alexandre.belloni@bootlin.com> a écrit : >> > Hello, >> > >> > On 13/07/2018 17:14:24+0200, Paul Cercueil wrote: @@ -17,10 +17,10 @@ Le sam. 14 juil. 2018 =E0 15:32, Alexandre Belloni=20 >> > > >> > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> >> > > --- ->> > > Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt=20 +>> > > Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt >> | 3 >> > > +++ ->> > > drivers/rtc/rtc-jz4740.c =20 +>> > > drivers/rtc/rtc-jz4740.c >> | 11 >> > > ++++++++++- >> > > 2 files changed, 13 insertions(+), 1 deletion(-) @@ -29,9 +29,9 @@ Le sam. 14 juil. 2018 =E0 15:32, Alexandre Belloni=20 >> > > a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt >> > > b/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt >> > > index 41c7ae18fd7b..a9e821de84f2 100644 ->> > > ---=20 +>> > > --- >> a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt ->> > > +++=20 +>> > > +++ >> b/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt >> > > @@ -4,6 +4,9 @@ Required properties: >> > > @@ -43,7 +43,7 @@ Le sam. 14 juil. 2018 =E0 15:32, Alexandre Belloni=20 >> > > - "ingenic,jz4780-rtc" - for use with the JZ4780 SoC >> > > - reg: Address range of rtc register set >> > > - interrupts: IRQ number for the alarm interrupt ->> > > diff --git a/drivers/rtc/rtc-jz4740.c=20 +>> > > diff --git a/drivers/rtc/rtc-jz4740.c >> b/drivers/rtc/rtc-jz4740.c >> > > index d0a891777f44..1c867e3a0ea5 100644 >> > > --- a/drivers/rtc/rtc-jz4740.c @@ -56,71 +56,71 @@ Le sam. 14 juil. 2018 =E0 15:32, Alexandre Belloni=20 >> > > + ID_JZ4760, >> > > + ID_JZ4770, >> > ->> > I wouldn't introduce those ids unless there are handling=20 +>> > I wouldn't introduce those ids unless there are handling >> differences at >> > some point. ->>=20 +>> >> Well there are handling differences, see below. ->>=20 +>> >> > > ID_JZ4780, >> > > }; >> > > ->> > > @@ -114,7 +117,7 @@ static inline int=20 +>> > > @@ -114,7 +117,7 @@ static inline int >> jz4740_rtc_reg_write(struct >> > > jz4740_rtc *rtc, size_t reg, >> > > { ->> > > int ret =3D 0; +>> > > int ret = 0; >> > > ->> > > - if (rtc->type >=3D ID_JZ4780) ->> > > + if (rtc->type >=3D ID_JZ4760) +>> > > - if (rtc->type >= ID_JZ4780) +>> > > + if (rtc->type >= ID_JZ4760) >> > >> > This would avoid that change (and the test would preferably be ->> > (rtc->type =3D=3D ID_JZ4780)) ->>=20 +>> > (rtc->type == ID_JZ4780)) +>> >> That branch should be taken if the SoC is JZ4760, JZ4770 or JZ4780. >> It should not be taken if the SoC is JZ4740 or JZ4725B. ->=20 +> > Sure but you can achieve that with only 2 ids... ->=20 ->>=20 ->> > > ret =3D jz4780_rtc_enable_write(rtc); ->> > > if (ret =3D=3D 0) ->> > > ret =3D jz4740_rtc_wait_write_ready(rtc); +> +>> +>> > > ret = jz4780_rtc_enable_write(rtc); +>> > > if (ret == 0) +>> > > ret = jz4740_rtc_wait_write_ready(rtc); >> > > @@ -300,6 +303,9 @@ static void jz4740_rtc_power_off(void) >> > > ->> > > static const struct of_device_id jz4740_rtc_of_match[] =3D { ->> > > { .compatible =3D "ingenic,jz4740-rtc", .data =3D (void=20 +>> > > static const struct of_device_id jz4740_rtc_of_match[] = { +>> > > { .compatible = "ingenic,jz4740-rtc", .data = (void >> *)ID_JZ4740 }, ->> > > + { .compatible =3D "ingenic,jz4725b-rtc", .data =3D (void=20 +>> > > + { .compatible = "ingenic,jz4725b-rtc", .data = (void >> *)ID_JZ4725B >> > > }, ->> > > + { .compatible =3D "ingenic,jz4760-rtc", .data =3D (void=20 +>> > > + { .compatible = "ingenic,jz4760-rtc", .data = (void >> *)ID_JZ4760 }, ->> > > + { .compatible =3D "ingenic,jz4770-rtc", .data =3D (void=20 +>> > > + { .compatible = "ingenic,jz4770-rtc", .data = (void >> *)ID_JZ4770 }, ->=20 +> > By doing the correct mapping here e.g: ->=20 -> { .compatible =3D "ingenic,jz4725b-rtc", .data =3D (void *)ID_JZ4740 }, +> +> { .compatible = "ingenic,jz4725b-rtc", .data = (void *)ID_JZ4740 }, Not very pretty and future-proof if you ask me... But you're the boss... ->> > > { .compatible =3D "ingenic,jz4780-rtc", .data =3D (void=20 +>> > > { .compatible = "ingenic,jz4780-rtc", .data = (void >> *)ID_JZ4780 }, >> > > {}, >> > > }; ->> > > @@ -428,6 +434,9 @@ static const struct dev_pm_ops=20 ->> jz4740_pm_ops =3D { +>> > > @@ -428,6 +434,9 @@ static const struct dev_pm_ops +>> jz4740_pm_ops = { >> > > ->> > > static const struct platform_device_id jz4740_rtc_ids[] =3D { +>> > > static const struct platform_device_id jz4740_rtc_ids[] = { >> > > { "jz4740-rtc", ID_JZ4740 }, >> > > + { "jz4725b-rtc", ID_JZ4725B }, >> > > + { "jz4760-rtc", ID_JZ4760 }, >> > > + { "jz4770-rtc", ID_JZ4770 }, ->=20 +> > And here ->=20 +> >> > > { "jz4780-rtc", ID_JZ4780 }, >> > > {} >> > > }; @@ -132,10 +132,9 @@ But you're the boss... >> > Alexandre Belloni, Bootlin (formerly Free Electrons) >> > Embedded Linux and Kernel engineering >> > https://bootlin.com ->>=20 ->=20 +>> +> > -- > Alexandre Belloni, Bootlin (formerly Free Electrons) > Embedded Linux and Kernel engineering > https://bootlin.com -= diff --git a/a/content_digest b/N1/content_digest index caf96fe..5448f47 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -16,13 +16,13 @@ "b\0" "\n" "\n" - "Le sam. 14 juil. 2018 =E0 15:32, Alexandre Belloni=20\n" - "<alexandre.belloni@bootlin.com> a =E9crit :\n" + "Le sam. 14 juil. 2018 \303\240 15:32, Alexandre Belloni \n" + "<alexandre.belloni@bootlin.com> a \303\251crit :\n" "> On 14/07/2018 15:25:33+0200, Paul Cercueil wrote:\n" ">> Hi Alexandre,\n" - ">>=20\n" - ">> Le sam. 14 juil. 2018 =E0 15:19, Alexandre Belloni\n" - ">> <alexandre.belloni@bootlin.com> a =E9crit :\n" + ">> \n" + ">> Le sam. 14 juil. 2018 \303\240 15:19, Alexandre Belloni\n" + ">> <alexandre.belloni@bootlin.com> a \303\251crit :\n" ">> > Hello,\n" ">> >\n" ">> > On 13/07/2018 17:14:24+0200, Paul Cercueil wrote:\n" @@ -33,10 +33,10 @@ ">> > >\n" ">> > > Signed-off-by: Paul Cercueil <paul@crapouillou.net>\n" ">> > > ---\n" - ">> > > Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt=20\n" + ">> > > Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt \n" ">> | 3\n" ">> > > +++\n" - ">> > > drivers/rtc/rtc-jz4740.c =20\n" + ">> > > drivers/rtc/rtc-jz4740.c \n" ">> | 11\n" ">> > > ++++++++++-\n" ">> > > 2 files changed, 13 insertions(+), 1 deletion(-)\n" @@ -45,9 +45,9 @@ ">> > > a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt\n" ">> > > b/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt\n" ">> > > index 41c7ae18fd7b..a9e821de84f2 100644\n" - ">> > > ---=20\n" + ">> > > --- \n" ">> a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt\n" - ">> > > +++=20\n" + ">> > > +++ \n" ">> b/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt\n" ">> > > @@ -4,6 +4,9 @@ Required properties:\n" ">> > >\n" @@ -59,7 +59,7 @@ ">> > > - \"ingenic,jz4780-rtc\" - for use with the JZ4780 SoC\n" ">> > > - reg: Address range of rtc register set\n" ">> > > - interrupts: IRQ number for the alarm interrupt\n" - ">> > > diff --git a/drivers/rtc/rtc-jz4740.c=20\n" + ">> > > diff --git a/drivers/rtc/rtc-jz4740.c \n" ">> b/drivers/rtc/rtc-jz4740.c\n" ">> > > index d0a891777f44..1c867e3a0ea5 100644\n" ">> > > --- a/drivers/rtc/rtc-jz4740.c\n" @@ -72,71 +72,71 @@ ">> > > +\tID_JZ4760,\n" ">> > > +\tID_JZ4770,\n" ">> >\n" - ">> > I wouldn't introduce those ids unless there are handling=20\n" + ">> > I wouldn't introduce those ids unless there are handling \n" ">> differences at\n" ">> > some point.\n" - ">>=20\n" + ">> \n" ">> Well there are handling differences, see below.\n" - ">>=20\n" + ">> \n" ">> > > \tID_JZ4780,\n" ">> > > };\n" ">> > >\n" - ">> > > @@ -114,7 +117,7 @@ static inline int=20\n" + ">> > > @@ -114,7 +117,7 @@ static inline int \n" ">> jz4740_rtc_reg_write(struct\n" ">> > > jz4740_rtc *rtc, size_t reg,\n" ">> > > {\n" - ">> > > \tint ret =3D 0;\n" + ">> > > \tint ret = 0;\n" ">> > >\n" - ">> > > -\tif (rtc->type >=3D ID_JZ4780)\n" - ">> > > +\tif (rtc->type >=3D ID_JZ4760)\n" + ">> > > -\tif (rtc->type >= ID_JZ4780)\n" + ">> > > +\tif (rtc->type >= ID_JZ4760)\n" ">> >\n" ">> > This would avoid that change (and the test would preferably be\n" - ">> > (rtc->type =3D=3D ID_JZ4780))\n" - ">>=20\n" + ">> > (rtc->type == ID_JZ4780))\n" + ">> \n" ">> That branch should be taken if the SoC is JZ4760, JZ4770 or JZ4780.\n" ">> It should not be taken if the SoC is JZ4740 or JZ4725B.\n" - ">=20\n" + "> \n" "> Sure but you can achieve that with only 2 ids...\n" - ">=20\n" - ">>=20\n" - ">> > > \t\tret =3D jz4780_rtc_enable_write(rtc);\n" - ">> > > \tif (ret =3D=3D 0)\n" - ">> > > \t\tret =3D jz4740_rtc_wait_write_ready(rtc);\n" + "> \n" + ">> \n" + ">> > > \t\tret = jz4780_rtc_enable_write(rtc);\n" + ">> > > \tif (ret == 0)\n" + ">> > > \t\tret = jz4740_rtc_wait_write_ready(rtc);\n" ">> > > @@ -300,6 +303,9 @@ static void jz4740_rtc_power_off(void)\n" ">> > >\n" - ">> > > static const struct of_device_id jz4740_rtc_of_match[] =3D {\n" - ">> > > \t{ .compatible =3D \"ingenic,jz4740-rtc\", .data =3D (void=20\n" + ">> > > static const struct of_device_id jz4740_rtc_of_match[] = {\n" + ">> > > \t{ .compatible = \"ingenic,jz4740-rtc\", .data = (void \n" ">> *)ID_JZ4740 },\n" - ">> > > +\t{ .compatible =3D \"ingenic,jz4725b-rtc\", .data =3D (void=20\n" + ">> > > +\t{ .compatible = \"ingenic,jz4725b-rtc\", .data = (void \n" ">> *)ID_JZ4725B\n" ">> > > },\n" - ">> > > +\t{ .compatible =3D \"ingenic,jz4760-rtc\", .data =3D (void=20\n" + ">> > > +\t{ .compatible = \"ingenic,jz4760-rtc\", .data = (void \n" ">> *)ID_JZ4760 },\n" - ">> > > +\t{ .compatible =3D \"ingenic,jz4770-rtc\", .data =3D (void=20\n" + ">> > > +\t{ .compatible = \"ingenic,jz4770-rtc\", .data = (void \n" ">> *)ID_JZ4770 },\n" - ">=20\n" + "> \n" "> By doing the correct mapping here e.g:\n" - ">=20\n" - "> { .compatible =3D \"ingenic,jz4725b-rtc\", .data =3D (void *)ID_JZ4740 },\n" + "> \n" + "> { .compatible = \"ingenic,jz4725b-rtc\", .data = (void *)ID_JZ4740 },\n" "\n" "Not very pretty and future-proof if you ask me...\n" "But you're the boss...\n" "\n" - ">> > > \t{ .compatible =3D \"ingenic,jz4780-rtc\", .data =3D (void=20\n" + ">> > > \t{ .compatible = \"ingenic,jz4780-rtc\", .data = (void \n" ">> *)ID_JZ4780 },\n" ">> > > \t{},\n" ">> > > };\n" - ">> > > @@ -428,6 +434,9 @@ static const struct dev_pm_ops=20\n" - ">> jz4740_pm_ops =3D {\n" + ">> > > @@ -428,6 +434,9 @@ static const struct dev_pm_ops \n" + ">> jz4740_pm_ops = {\n" ">> > >\n" - ">> > > static const struct platform_device_id jz4740_rtc_ids[] =3D {\n" + ">> > > static const struct platform_device_id jz4740_rtc_ids[] = {\n" ">> > > \t{ \"jz4740-rtc\", ID_JZ4740 },\n" ">> > > +\t{ \"jz4725b-rtc\", ID_JZ4725B },\n" ">> > > +\t{ \"jz4760-rtc\", ID_JZ4760 },\n" ">> > > +\t{ \"jz4770-rtc\", ID_JZ4770 },\n" - ">=20\n" + "> \n" "> And here\n" - ">=20\n" + "> \n" ">> > > \t{ \"jz4780-rtc\", ID_JZ4780 },\n" ">> > > \t{}\n" ">> > > };\n" @@ -148,12 +148,11 @@ ">> > Alexandre Belloni, Bootlin (formerly Free Electrons)\n" ">> > Embedded Linux and Kernel engineering\n" ">> > https://bootlin.com\n" - ">>=20\n" - ">=20\n" + ">> \n" + "> \n" "> --\n" "> Alexandre Belloni, Bootlin (formerly Free Electrons)\n" "> Embedded Linux and Kernel engineering\n" - "> https://bootlin.com\n" - = + > https://bootlin.com -b6395b4959bd64c5375636036ec41aef64cd70251314f13e8191526f3a84ccb4 +e92ac407cbce5859e2e5334351c8dfd0db01c542756545b716319e4d49a2a008
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.