diff for duplicates of <20151026143411.GL597@x1> diff --git a/a/1.txt b/N1/1.txt index b65b36f..241b3b7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,13 @@ On Mon, 26 Oct 2015, Alim Akhtar wrote: > From: Thomas Abraham <thomas.ab@samsung.com> -> -> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15 +>=20 +> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS1= +5 > PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz > clock outputs and battery charger. This patch adds initial support for > LDO and buck regulators of S2MPS15 device. -> +>=20 > Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> > Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com> > [Alim: Added s2mps15_devs like rtc and clk and related changes] @@ -15,7 +16,8 @@ On Mon, 26 Oct 2015, Alim Akhtar wrote: > drivers/mfd/sec-core.c | 31 +++++++ > drivers/mfd/sec-irq.c | 8 ++ > include/linux/mfd/samsung/core.h | 1 + -> include/linux/mfd/samsung/s2mps15.h | 158 +++++++++++++++++++++++++++++++++++ +> include/linux/mfd/samsung/s2mps15.h | 158 +++++++++++++++++++++++++++++= +++++++ > 4 files changed, 198 insertions(+) > create mode 100644 include/linux/mfd/samsung/s2mps15.h @@ -34,98 +36,101 @@ all of the open points are solved. > #include <linux/mfd/samsung/s2mpu02.h> > #include <linux/mfd/samsung/s5m8763.h> > #include <linux/mfd/samsung/s5m8767.h> -> @@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] = { +> @@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] =3D { > } > }; -> -> +static const struct mfd_cell s2mps15_devs[] = { +> =20 +> +static const struct mfd_cell s2mps15_devs[] =3D { > + { -> + .name = "s2mps15-pmic", +> + .name =3D "s2mps15-pmic", > + }, { -> + .name = "s2mps15-rtc", +> + .name =3D "s2mps15-rtc", > + }, { -> + .name = "s2mps15-clk", -> + .of_compatible = "samsung,s2mps15-clk", +> + .name =3D "s2mps15-clk", +> + .of_compatible =3D "samsung,s2mps15-clk", > + }, > +}; > + -> static const struct mfd_cell s2mpa01_devs[] = { +> static const struct mfd_cell s2mpa01_devs[] =3D { > { -> .name = "s2mpa01-pmic", -> @@ -125,6 +137,9 @@ static const struct of_device_id sec_dt_match[] = { -> .compatible = "samsung,s2mps14-pmic", -> .data = (void *)S2MPS14X, +> .name =3D "s2mpa01-pmic", +> @@ -125,6 +137,9 @@ static const struct of_device_id sec_dt_match[] =3D { +> .compatible =3D "samsung,s2mps14-pmic", +> .data =3D (void *)S2MPS14X, > }, { -> + .compatible = "samsung,s2mps15-pmic", -> + .data = (void *)S2MPS15X, +> + .compatible =3D "samsung,s2mps15-pmic", +> + .data =3D (void *)S2MPS15X, > + }, { -> .compatible = "samsung,s2mpa01-pmic", -> .data = (void *)S2MPA01, +> .compatible =3D "samsung,s2mpa01-pmic", +> .data =3D (void *)S2MPA01, > }, { -> @@ -226,6 +241,15 @@ static const struct regmap_config s2mps14_regmap_config = { -> .cache_type = REGCACHE_FLAT, +> @@ -226,6 +241,15 @@ static const struct regmap_config s2mps14_regmap_con= +fig =3D { +> .cache_type =3D REGCACHE_FLAT, > }; -> -> +static const struct regmap_config s2mps15_regmap_config = { -> + .reg_bits = 8, -> + .val_bits = 8, +> =20 +> +static const struct regmap_config s2mps15_regmap_config =3D { +> + .reg_bits =3D 8, +> + .val_bits =3D 8, > + -> + .max_register = S2MPS15_REG_LDODSCH4, -> + .volatile_reg = s2mps11_volatile, -> + .cache_type = REGCACHE_FLAT, +> + .max_register =3D S2MPS15_REG_LDODSCH4, +> + .volatile_reg =3D s2mps11_volatile, +> + .cache_type =3D REGCACHE_FLAT, > +}; > + -> static const struct regmap_config s2mpu02_regmap_config = { -> .reg_bits = 8, -> .val_bits = 8, +> static const struct regmap_config s2mpu02_regmap_config =3D { +> .reg_bits =3D 8, +> .val_bits =3D 8, > @@ -387,6 +411,9 @@ static int sec_pmic_probe(struct i2c_client *i2c, > case S2MPS14X: -> regmap = &s2mps14_regmap_config; +> regmap =3D &s2mps14_regmap_config; > break; > + case S2MPS15X: -> + regmap = &s2mps15_regmap_config; +> + regmap =3D &s2mps15_regmap_config; > + break; > case S5M8763X: -> regmap = &s5m8763_regmap_config; +> regmap =3D &s5m8763_regmap_config; > break; > @@ -445,6 +472,10 @@ static int sec_pmic_probe(struct i2c_client *i2c, -> sec_devs = s2mps14_devs; -> num_sec_devs = ARRAY_SIZE(s2mps14_devs); +> sec_devs =3D s2mps14_devs; +> num_sec_devs =3D ARRAY_SIZE(s2mps14_devs); > break; > + case S2MPS15X: -> + sec_devs = s2mps15_devs; -> + num_sec_devs = ARRAY_SIZE(s2mps15_devs); +> + sec_devs =3D s2mps15_devs; +> + num_sec_devs =3D ARRAY_SIZE(s2mps15_devs); > + break; > case S2MPU02: -> sec_devs = s2mpu02_devs; -> num_sec_devs = ARRAY_SIZE(s2mpu02_devs); +> sec_devs =3D s2mpu02_devs; +> num_sec_devs =3D ARRAY_SIZE(s2mpu02_devs); > diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c > index 806fa8dbb22d..d77de431cc50 100644 > --- a/drivers/mfd/sec-irq.c > +++ b/drivers/mfd/sec-irq.c -> @@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip = { +> @@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip= + =3D { > S2MPS1X_IRQ_CHIP_COMMON_DATA, > }; -> -> +static const struct regmap_irq_chip s2mps15_irq_chip = { -> + .name = "s2mps15", +> =20 +> +static const struct regmap_irq_chip s2mps15_irq_chip =3D { +> + .name =3D "s2mps15", > + S2MPS1X_IRQ_CHIP_COMMON_DATA, > +}; > + -> static const struct regmap_irq_chip s2mpu02_irq_chip = { -> .name = "s2mpu02", -> .irqs = s2mpu02_irqs, +> static const struct regmap_irq_chip s2mpu02_irq_chip =3D { +> .name =3D "s2mpu02", +> .irqs =3D s2mpu02_irqs, > @@ -466,6 +471,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) > case S2MPS14X: -> sec_irq_chip = &s2mps14_irq_chip; +> sec_irq_chip =3D &s2mps14_irq_chip; > break; > + case S2MPS15X: -> + sec_irq_chip = &s2mps15_irq_chip; +> + sec_irq_chip =3D &s2mps15_irq_chip; > + break; > case S2MPU02: -> sec_irq_chip = &s2mpu02_irq_chip; +> sec_irq_chip =3D &s2mpu02_irq_chip; > break; -> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h +> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung= +/core.h > index a06098639399..6bc4bcd488ac 100644 > --- a/include/linux/mfd/samsung/core.h > +++ b/include/linux/mfd/samsung/core.h @@ -136,8 +141,9 @@ all of the open points are solved. > + S2MPS15X, > S2MPU02, > }; -> -> diff --git a/include/linux/mfd/samsung/s2mps15.h b/include/linux/mfd/samsung/s2mps15.h +> =20 +> diff --git a/include/linux/mfd/samsung/s2mps15.h b/include/linux/mfd/sams= +ung/s2mps15.h > new file mode 100644 > index 000000000000..36d35287c3c0 > --- /dev/null @@ -147,9 +153,12 @@ all of the open points are solved. > + * Copyright (c) 2015 Samsung Electronics Co., Ltd > + * http://www.samsung.com > + * -> + * This program is free software; you can redistribute it and/or modify it -> + * under the terms of the GNU General Public License as published by the -> + * Free Software Foundation; either version 2 of the License, or (at your +> + * This program is free software; you can redistribute it and/or modify= + it +> + * under the terms of the GNU General Public License as published by = +the +> + * Free Software Foundation; either version 2 of the License, or (at y= +our > + * option) any later version. > + * > + * This program is distributed in the hope that it will be useful, @@ -302,8 +311,21 @@ all of the open points are solved. > + > +#endif /* __LINUX_MFD_S2MPS15_H */ --- +--=20 Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org │ Open source software for ARM SoCs +Linaro.org =E2=94=82 Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog + +--=20 +--=20 +You received this message because you are subscribed to "rtc-linux". +Membership options at http://groups.google.com/group/rtc-linux . +Please read http://groups.google.com/group/rtc-linux/web/checklist +before submitting a driver. +---=20 +You received this message because you are subscribed to the Google Groups "= +rtc-linux" group. +To unsubscribe from this group and stop receiving emails from it, send an e= +mail to rtc-linux+unsubscribe@googlegroups.com. +For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N1/content_digest index 840c121..81dfe37 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01445863883-5187-1-git-send-email-alim.akhtar@samsung.com\0" "ref\01445863883-5187-3-git-send-email-alim.akhtar@samsung.com\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC\0" + "Subject\0[rtc-linux] Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC\0" "Date\0Mon, 26 Oct 2015 14:34:11 +0000\0" "To\0Alim Akhtar <alim.akhtar@samsung.com>\0" "Cc\0broonie@kernel.org" @@ -17,12 +17,13 @@ "On Mon, 26 Oct 2015, Alim Akhtar wrote:\n" "\n" "> From: Thomas Abraham <thomas.ab@samsung.com>\n" - "> \n" - "> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15\n" + ">=20\n" + "> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS1=\n" + "5\n" "> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz\n" "> clock outputs and battery charger. This patch adds initial support for\n" "> LDO and buck regulators of S2MPS15 device.\n" - "> \n" + ">=20\n" "> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>\n" "> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>\n" "> [Alim: Added s2mps15_devs like rtc and clk and related changes]\n" @@ -31,7 +32,8 @@ "> drivers/mfd/sec-core.c | 31 +++++++\n" "> drivers/mfd/sec-irq.c | 8 ++\n" "> include/linux/mfd/samsung/core.h | 1 +\n" - "> include/linux/mfd/samsung/s2mps15.h | 158 +++++++++++++++++++++++++++++++++++\n" + "> include/linux/mfd/samsung/s2mps15.h | 158 +++++++++++++++++++++++++++++=\n" + "++++++\n" "> 4 files changed, 198 insertions(+)\n" "> create mode 100644 include/linux/mfd/samsung/s2mps15.h\n" "\n" @@ -50,98 +52,101 @@ "> #include <linux/mfd/samsung/s2mpu02.h>\n" "> #include <linux/mfd/samsung/s5m8763.h>\n" "> #include <linux/mfd/samsung/s5m8767.h>\n" - "> @@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] = {\n" + "> @@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] =3D {\n" "> \t}\n" "> };\n" - "> \n" - "> +static const struct mfd_cell s2mps15_devs[] = {\n" + "> =20\n" + "> +static const struct mfd_cell s2mps15_devs[] =3D {\n" "> +\t{\n" - "> +\t\t.name = \"s2mps15-pmic\",\n" + "> +\t\t.name =3D \"s2mps15-pmic\",\n" "> +\t}, {\n" - "> +\t\t.name = \"s2mps15-rtc\",\n" + "> +\t\t.name =3D \"s2mps15-rtc\",\n" "> +\t}, {\n" - "> +\t\t.name = \"s2mps15-clk\",\n" - "> +\t\t.of_compatible = \"samsung,s2mps15-clk\",\n" + "> +\t\t.name =3D \"s2mps15-clk\",\n" + "> +\t\t.of_compatible =3D \"samsung,s2mps15-clk\",\n" "> +\t},\n" "> +};\n" "> +\n" - "> static const struct mfd_cell s2mpa01_devs[] = {\n" + "> static const struct mfd_cell s2mpa01_devs[] =3D {\n" "> \t{\n" - "> \t\t.name = \"s2mpa01-pmic\",\n" - "> @@ -125,6 +137,9 @@ static const struct of_device_id sec_dt_match[] = {\n" - "> \t\t.compatible = \"samsung,s2mps14-pmic\",\n" - "> \t\t.data = (void *)S2MPS14X,\n" + "> \t\t.name =3D \"s2mpa01-pmic\",\n" + "> @@ -125,6 +137,9 @@ static const struct of_device_id sec_dt_match[] =3D {\n" + "> \t\t.compatible =3D \"samsung,s2mps14-pmic\",\n" + "> \t\t.data =3D (void *)S2MPS14X,\n" "> \t}, {\n" - "> +\t\t.compatible = \"samsung,s2mps15-pmic\",\n" - "> +\t\t.data = (void *)S2MPS15X,\n" + "> +\t\t.compatible =3D \"samsung,s2mps15-pmic\",\n" + "> +\t\t.data =3D (void *)S2MPS15X,\n" "> +\t}, {\n" - "> \t\t.compatible = \"samsung,s2mpa01-pmic\",\n" - "> \t\t.data = (void *)S2MPA01,\n" + "> \t\t.compatible =3D \"samsung,s2mpa01-pmic\",\n" + "> \t\t.data =3D (void *)S2MPA01,\n" "> \t}, {\n" - "> @@ -226,6 +241,15 @@ static const struct regmap_config s2mps14_regmap_config = {\n" - "> \t.cache_type = REGCACHE_FLAT,\n" + "> @@ -226,6 +241,15 @@ static const struct regmap_config s2mps14_regmap_con=\n" + "fig =3D {\n" + "> \t.cache_type =3D REGCACHE_FLAT,\n" "> };\n" - "> \n" - "> +static const struct regmap_config s2mps15_regmap_config = {\n" - "> +\t.reg_bits = 8,\n" - "> +\t.val_bits = 8,\n" + "> =20\n" + "> +static const struct regmap_config s2mps15_regmap_config =3D {\n" + "> +\t.reg_bits =3D 8,\n" + "> +\t.val_bits =3D 8,\n" "> +\n" - "> +\t.max_register = S2MPS15_REG_LDODSCH4,\n" - "> +\t.volatile_reg = s2mps11_volatile,\n" - "> +\t.cache_type = REGCACHE_FLAT,\n" + "> +\t.max_register =3D S2MPS15_REG_LDODSCH4,\n" + "> +\t.volatile_reg =3D s2mps11_volatile,\n" + "> +\t.cache_type =3D REGCACHE_FLAT,\n" "> +};\n" "> +\n" - "> static const struct regmap_config s2mpu02_regmap_config = {\n" - "> \t.reg_bits = 8,\n" - "> \t.val_bits = 8,\n" + "> static const struct regmap_config s2mpu02_regmap_config =3D {\n" + "> \t.reg_bits =3D 8,\n" + "> \t.val_bits =3D 8,\n" "> @@ -387,6 +411,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,\n" "> \tcase S2MPS14X:\n" - "> \t\tregmap = &s2mps14_regmap_config;\n" + "> \t\tregmap =3D &s2mps14_regmap_config;\n" "> \t\tbreak;\n" "> +\tcase S2MPS15X:\n" - "> +\t\tregmap = &s2mps15_regmap_config;\n" + "> +\t\tregmap =3D &s2mps15_regmap_config;\n" "> +\t\tbreak;\n" "> \tcase S5M8763X:\n" - "> \t\tregmap = &s5m8763_regmap_config;\n" + "> \t\tregmap =3D &s5m8763_regmap_config;\n" "> \t\tbreak;\n" "> @@ -445,6 +472,10 @@ static int sec_pmic_probe(struct i2c_client *i2c,\n" - "> \t\tsec_devs = s2mps14_devs;\n" - "> \t\tnum_sec_devs = ARRAY_SIZE(s2mps14_devs);\n" + "> \t\tsec_devs =3D s2mps14_devs;\n" + "> \t\tnum_sec_devs =3D ARRAY_SIZE(s2mps14_devs);\n" "> \t\tbreak;\n" "> +\tcase S2MPS15X:\n" - "> +\t\tsec_devs = s2mps15_devs;\n" - "> +\t\tnum_sec_devs = ARRAY_SIZE(s2mps15_devs);\n" + "> +\t\tsec_devs =3D s2mps15_devs;\n" + "> +\t\tnum_sec_devs =3D ARRAY_SIZE(s2mps15_devs);\n" "> +\t\tbreak;\n" "> \tcase S2MPU02:\n" - "> \t\tsec_devs = s2mpu02_devs;\n" - "> \t\tnum_sec_devs = ARRAY_SIZE(s2mpu02_devs);\n" + "> \t\tsec_devs =3D s2mpu02_devs;\n" + "> \t\tnum_sec_devs =3D ARRAY_SIZE(s2mpu02_devs);\n" "> diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c\n" "> index 806fa8dbb22d..d77de431cc50 100644\n" "> --- a/drivers/mfd/sec-irq.c\n" "> +++ b/drivers/mfd/sec-irq.c\n" - "> @@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip = {\n" + "> @@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip=\n" + " =3D {\n" "> \tS2MPS1X_IRQ_CHIP_COMMON_DATA,\n" "> };\n" - "> \n" - "> +static const struct regmap_irq_chip s2mps15_irq_chip = {\n" - "> +\t.name = \"s2mps15\",\n" + "> =20\n" + "> +static const struct regmap_irq_chip s2mps15_irq_chip =3D {\n" + "> +\t.name =3D \"s2mps15\",\n" "> +\tS2MPS1X_IRQ_CHIP_COMMON_DATA,\n" "> +};\n" "> +\n" - "> static const struct regmap_irq_chip s2mpu02_irq_chip = {\n" - "> \t.name = \"s2mpu02\",\n" - "> \t.irqs = s2mpu02_irqs,\n" + "> static const struct regmap_irq_chip s2mpu02_irq_chip =3D {\n" + "> \t.name =3D \"s2mpu02\",\n" + "> \t.irqs =3D s2mpu02_irqs,\n" "> @@ -466,6 +471,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)\n" "> \tcase S2MPS14X:\n" - "> \t\tsec_irq_chip = &s2mps14_irq_chip;\n" + "> \t\tsec_irq_chip =3D &s2mps14_irq_chip;\n" "> \t\tbreak;\n" "> +\tcase S2MPS15X:\n" - "> +\t\tsec_irq_chip = &s2mps15_irq_chip;\n" + "> +\t\tsec_irq_chip =3D &s2mps15_irq_chip;\n" "> +\t\tbreak;\n" "> \tcase S2MPU02:\n" - "> \t\tsec_irq_chip = &s2mpu02_irq_chip;\n" + "> \t\tsec_irq_chip =3D &s2mpu02_irq_chip;\n" "> \t\tbreak;\n" - "> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h\n" + "> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung=\n" + "/core.h\n" "> index a06098639399..6bc4bcd488ac 100644\n" "> --- a/include/linux/mfd/samsung/core.h\n" "> +++ b/include/linux/mfd/samsung/core.h\n" @@ -152,8 +157,9 @@ "> +\tS2MPS15X,\n" "> \tS2MPU02,\n" "> };\n" - "> \n" - "> diff --git a/include/linux/mfd/samsung/s2mps15.h b/include/linux/mfd/samsung/s2mps15.h\n" + "> =20\n" + "> diff --git a/include/linux/mfd/samsung/s2mps15.h b/include/linux/mfd/sams=\n" + "ung/s2mps15.h\n" "> new file mode 100644\n" "> index 000000000000..36d35287c3c0\n" "> --- /dev/null\n" @@ -163,9 +169,12 @@ "> + * Copyright (c) 2015 Samsung Electronics Co., Ltd\n" "> + * http://www.samsung.com\n" "> + *\n" - "> + * This program is free software; you can redistribute it and/or modify it\n" - "> + * under the terms of the GNU General Public License as published by the\n" - "> + * Free Software Foundation; either version 2 of the License, or (at your\n" + "> + * This program is free software; you can redistribute it and/or modify=\n" + " it\n" + "> + * under the terms of the GNU General Public License as published by =\n" + "the\n" + "> + * Free Software Foundation; either version 2 of the License, or (at y=\n" + "our\n" "> + * option) any later version.\n" "> + *\n" "> + * This program is distributed in the hope that it will be useful,\n" @@ -318,10 +327,23 @@ "> +\n" "> +#endif /* __LINUX_MFD_S2MPS15_H */\n" "\n" - "-- \n" + "--=20\n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org \342\224\202 Open source software for ARM SoCs\n" - Follow Linaro: Facebook | Twitter | Blog + "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" + "Follow Linaro: Facebook | Twitter | Blog\n" + "\n" + "--=20\n" + "--=20\n" + "You received this message because you are subscribed to \"rtc-linux\".\n" + "Membership options at http://groups.google.com/group/rtc-linux .\n" + "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" + "before submitting a driver.\n" + "---=20\n" + "You received this message because you are subscribed to the Google Groups \"=\n" + "rtc-linux\" group.\n" + "To unsubscribe from this group and stop receiving emails from it, send an e=\n" + "mail to rtc-linux+unsubscribe@googlegroups.com.\n" + For more options, visit https://groups.google.com/d/optout. -61818bd1e095706020bcfcd210bf0381929f6cfbc9ad13f76fc5178ae20698f2 +0f30811bc659fc381523a5aee1c1a32d3d1b8fe524bff0319c7e765af52a628c
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.