diff for duplicates of <1531574734.2831.0@smtp.crapouillou.net> diff --git a/a/1.txt b/N1/1.txt index 5d20395..f860447 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,31 +1,31 @@ Hi Alexandre, -Le sam. 14 juil. 2018 =E0 15:19, Alexandre Belloni=20 -<alexandre.belloni@bootlin.com> a =E9crit : +Le sam. 14 juil. 2018 à 15:19, Alexandre Belloni +<alexandre.belloni@bootlin.com> a écrit : > Hello, ->=20 +> > On 13/07/2018 17:14:24+0200, Paul Cercueil wrote: >> The RTC in the JZ4725B works just like the one in the JZ4740. ->>=20 ->> The RTC in the JZ4760 and JZ4770 work just like the one in the=20 +>> +>> The RTC in the JZ4760 and JZ4770 work just like the one in the >> JZ4780. ->>=20 +>> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> >> --- ->> Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt | 3=20 +>> Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt | 3 >> +++ ->> drivers/rtc/rtc-jz4740.c | 11=20 +>> drivers/rtc/rtc-jz4740.c | 11 >> ++++++++++- >> 2 files changed, 13 insertions(+), 1 deletion(-) ->>=20 ->> diff --git=20 ->> a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt=20 +>> +>> diff --git +>> a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt >> b/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt >> index 41c7ae18fd7b..a9e821de84f2 100644 >> --- a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt >> +++ b/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt >> @@ -4,6 +4,9 @@ Required properties: ->>=20 +>> >> - compatible: One of: >> - "ingenic,jz4740-rtc" - for use with the JZ4740 SoC >> + - "ingenic,jz4725b-rtc" - for use with the JZ4725B SoC @@ -39,14 +39,14 @@ Le sam. 14 juil. 2018 =E0 15:19, Alexandre Belloni=20 >> --- a/drivers/rtc/rtc-jz4740.c >> +++ b/drivers/rtc/rtc-jz4740.c >> @@ -54,6 +54,9 @@ ->>=20 +>> >> enum jz4740_rtc_type { >> ID_JZ4740, >> + ID_JZ4725B, >> + ID_JZ4760, >> + ID_JZ4770, ->=20 -> I wouldn't introduce those ids unless there are handling differences=20 +> +> I wouldn't introduce those ids unless there are handling differences > at > some point. @@ -54,43 +54,38 @@ Well there are handling differences, see below. >> ID_JZ4780, >> }; ->>=20 ->> @@ -114,7 +117,7 @@ static inline int jz4740_rtc_reg_write(struct=20 +>> +>> @@ -114,7 +117,7 @@ static inline int jz4740_rtc_reg_write(struct >> jz4740_rtc *rtc, size_t reg, >> { ->> int ret =3D 0; ->>=20 ->> - if (rtc->type >=3D ID_JZ4780) ->> + if (rtc->type >=3D ID_JZ4760) ->=20 -> This would avoid that change (and the test would preferably be=20 -> (rtc->type =3D=3D ID_JZ4780)) +>> int ret = 0; +>> +>> - if (rtc->type >= ID_JZ4780) +>> + if (rtc->type >= ID_JZ4760) +> +> This would avoid that change (and the test would preferably be +> (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. ->> 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) ->>=20 ->> static const struct of_device_id jz4740_rtc_of_match[] =3D { ->> { .compatible =3D "ingenic,jz4740-rtc", .data =3D (void *)ID_JZ4740 }= -, ->> + { .compatible =3D "ingenic,jz4725b-rtc", .data =3D (void *)ID_JZ4725B= -=20 +>> +>> static const struct of_device_id jz4740_rtc_of_match[] = { +>> { .compatible = "ingenic,jz4740-rtc", .data = (void *)ID_JZ4740 }, +>> + { .compatible = "ingenic,jz4725b-rtc", .data = (void *)ID_JZ4725B >> }, ->> + { .compatible =3D "ingenic,jz4760-rtc", .data =3D (void *)ID_JZ4760 }= -, ->> + { .compatible =3D "ingenic,jz4770-rtc", .data =3D (void *)ID_JZ4770 }= -, ->> { .compatible =3D "ingenic,jz4780-rtc", .data =3D (void *)ID_JZ4780 }= -, +>> + { .compatible = "ingenic,jz4760-rtc", .data = (void *)ID_JZ4760 }, +>> + { .compatible = "ingenic,jz4770-rtc", .data = (void *)ID_JZ4770 }, +>> { .compatible = "ingenic,jz4780-rtc", .data = (void *)ID_JZ4780 }, >> {}, >> }; ->> @@ -428,6 +434,9 @@ static const struct dev_pm_ops jz4740_pm_ops =3D { ->>=20 ->> static const struct platform_device_id jz4740_rtc_ids[] =3D { +>> @@ -428,6 +434,9 @@ static const struct dev_pm_ops jz4740_pm_ops = { +>> +>> static const struct platform_device_id jz4740_rtc_ids[] = { >> { "jz4740-rtc", ID_JZ4740 }, >> + { "jz4725b-rtc", ID_JZ4725B }, >> + { "jz4760-rtc", ID_JZ4760 }, @@ -100,10 +95,9 @@ It should not be taken if the SoC is JZ4740 or JZ4725B. >> }; >> -- >> 2.11.0 ->>=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 69902cd..2d6b962 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,32 +14,32 @@ "b\0" "Hi Alexandre,\n" "\n" - "Le sam. 14 juil. 2018 =E0 15:19, Alexandre Belloni=20\n" - "<alexandre.belloni@bootlin.com> a =E9crit :\n" + "Le sam. 14 juil. 2018 \303\240 15:19, Alexandre Belloni \n" + "<alexandre.belloni@bootlin.com> a \303\251crit :\n" "> Hello,\n" - ">=20\n" + "> \n" "> On 13/07/2018 17:14:24+0200, Paul Cercueil wrote:\n" ">> The RTC in the JZ4725B works just like the one in the JZ4740.\n" - ">>=20\n" - ">> The RTC in the JZ4760 and JZ4770 work just like the one in the=20\n" + ">> \n" + ">> The RTC in the JZ4760 and JZ4770 work just like the one in the \n" ">> JZ4780.\n" - ">>=20\n" + ">> \n" ">> Signed-off-by: Paul Cercueil <paul@crapouillou.net>\n" ">> ---\n" - ">> Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt | 3=20\n" + ">> Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt | 3 \n" ">> +++\n" - ">> drivers/rtc/rtc-jz4740.c | 11=20\n" + ">> drivers/rtc/rtc-jz4740.c | 11 \n" ">> ++++++++++-\n" ">> 2 files changed, 13 insertions(+), 1 deletion(-)\n" - ">>=20\n" - ">> diff --git=20\n" - ">> a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt=20\n" + ">> \n" + ">> diff --git \n" + ">> 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" ">> --- a/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt\n" ">> +++ b/Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt\n" ">> @@ -4,6 +4,9 @@ Required properties:\n" - ">>=20\n" + ">> \n" ">> - compatible: One of:\n" ">> - \"ingenic,jz4740-rtc\" - for use with the JZ4740 SoC\n" ">> + - \"ingenic,jz4725b-rtc\" - for use with the JZ4725B SoC\n" @@ -53,14 +53,14 @@ ">> --- a/drivers/rtc/rtc-jz4740.c\n" ">> +++ b/drivers/rtc/rtc-jz4740.c\n" ">> @@ -54,6 +54,9 @@\n" - ">>=20\n" + ">> \n" ">> enum jz4740_rtc_type {\n" ">> \tID_JZ4740,\n" ">> +\tID_JZ4725B,\n" ">> +\tID_JZ4760,\n" ">> +\tID_JZ4770,\n" - ">=20\n" - "> I wouldn't introduce those ids unless there are handling differences=20\n" + "> \n" + "> I wouldn't introduce those ids unless there are handling differences \n" "> at\n" "> some point.\n" "\n" @@ -68,43 +68,38 @@ "\n" ">> \tID_JZ4780,\n" ">> };\n" - ">>=20\n" - ">> @@ -114,7 +117,7 @@ static inline int jz4740_rtc_reg_write(struct=20\n" + ">> \n" + ">> @@ -114,7 +117,7 @@ static inline int jz4740_rtc_reg_write(struct \n" ">> jz4740_rtc *rtc, size_t reg,\n" ">> {\n" - ">> \tint ret =3D 0;\n" - ">>=20\n" - ">> -\tif (rtc->type >=3D ID_JZ4780)\n" - ">> +\tif (rtc->type >=3D ID_JZ4760)\n" - ">=20\n" - "> This would avoid that change (and the test would preferably be=20\n" - "> (rtc->type =3D=3D ID_JZ4780))\n" + ">> \tint ret = 0;\n" + ">> \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 == 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" "\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" + ">> \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" - ">>=20\n" - ">> static const struct of_device_id jz4740_rtc_of_match[] =3D {\n" - ">> \t{ .compatible =3D \"ingenic,jz4740-rtc\", .data =3D (void *)ID_JZ4740 }=\n" - ",\n" - ">> +\t{ .compatible =3D \"ingenic,jz4725b-rtc\", .data =3D (void *)ID_JZ4725B=\n" - "=20\n" + ">> \n" + ">> static const struct of_device_id jz4740_rtc_of_match[] = {\n" + ">> \t{ .compatible = \"ingenic,jz4740-rtc\", .data = (void *)ID_JZ4740 },\n" + ">> +\t{ .compatible = \"ingenic,jz4725b-rtc\", .data = (void *)ID_JZ4725B \n" ">> },\n" - ">> +\t{ .compatible =3D \"ingenic,jz4760-rtc\", .data =3D (void *)ID_JZ4760 }=\n" - ",\n" - ">> +\t{ .compatible =3D \"ingenic,jz4770-rtc\", .data =3D (void *)ID_JZ4770 }=\n" - ",\n" - ">> \t{ .compatible =3D \"ingenic,jz4780-rtc\", .data =3D (void *)ID_JZ4780 }=\n" - ",\n" + ">> +\t{ .compatible = \"ingenic,jz4760-rtc\", .data = (void *)ID_JZ4760 },\n" + ">> +\t{ .compatible = \"ingenic,jz4770-rtc\", .data = (void *)ID_JZ4770 },\n" + ">> \t{ .compatible = \"ingenic,jz4780-rtc\", .data = (void *)ID_JZ4780 },\n" ">> \t{},\n" ">> };\n" - ">> @@ -428,6 +434,9 @@ static const struct dev_pm_ops jz4740_pm_ops =3D {\n" - ">>=20\n" - ">> static const struct platform_device_id jz4740_rtc_ids[] =3D {\n" + ">> @@ -428,6 +434,9 @@ static const struct dev_pm_ops jz4740_pm_ops = {\n" + ">> \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" @@ -114,12 +109,11 @@ ">> };\n" ">> --\n" ">> 2.11.0\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 -0f869c236a5debef1b5d8bad76550b1f710a87deff0320bc9e203baa35158e41 +735d3c12be286677e1911c2ccab746c8596b4eca5f3dcfa3d2427c2385ae571b
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.