diff for duplicates of <20160509155616.GE19473@dell> diff --git a/a/1.txt b/N1/1.txt index e378b6b..b8e93a2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,20 +1,20 @@ On Mon, 09 May 2016, Lee Jones wrote: -> On Fri, 22 Apr 2016, tthayer@opensource.altera.com wrote: +> On Fri, 22 Apr 2016, ttha...@opensource.altera.com wrote: > -> > From: Thor Thayer <tthayer@opensource.altera.com> +> > From: Thor Thayer <ttha...@opensource.altera.com> > > > > Add support for power supply alarms to the Altera Arria10 > > Development Kit System Resource chip. > > -> > Signed-off-by: Thor Thayer <tthayer@opensource.altera.com> +> > Signed-off-by: Thor Thayer <ttha...@opensource.altera.com> > > --- > > drivers/mfd/altera-a10sr.c | 4 ++++ > > include/linux/mfd/altera-a10sr.h | 24 ++++++++++++++++++++++++ > > 2 files changed, 28 insertions(+) > > For my own reference: -> Acked-by: Lee Jones <lee.jones@linaro.org> +> Acked-by: Lee Jones <lee.jo...@linaro.org> Change of plan, this should really be squashed into patch 3. @@ -23,17 +23,18 @@ Change of plan, this should really be squashed into patch 3. > > --- a/drivers/mfd/altera-a10sr.c > > +++ b/drivers/mfd/altera-a10sr.c > > @@ -31,6 +31,10 @@ static const struct mfd_cell altr_a10sr_subdev_info[] = { -> > .name = "altr_a10sr_gpio", -> > .of_compatible = "altr,a10sr-gpio", -> > }, -> > + { -> > + .name = "altr_a10sr_hwmon", -> > + .of_compatible = "altr,a10sr-hwmon", -> > + }, +> > .name = "altr_a10sr_gpio", +> > .of_compatible = "altr,a10sr-gpio", +> > }, +> > + { +> > + .name = "altr_a10sr_hwmon", +> > + .of_compatible = "altr,a10sr-hwmon", +> > + }, > > }; > > > > static bool altr_a10sr_reg_readable(struct device *dev, unsigned int reg) -> > diff --git a/include/linux/mfd/altera-a10sr.h b/include/linux/mfd/altera-a10sr.h +> > diff --git a/include/linux/mfd/altera-a10sr.h +> > b/include/linux/mfd/altera-a10sr.h > > index c869fe7..22aa830 100644 > > --- a/include/linux/mfd/altera-a10sr.h > > +++ b/include/linux/mfd/altera-a10sr.h @@ -54,7 +55,8 @@ Change of plan, this should really be squashed into patch 3. > > #define ALTR_A10SR_PWR_GOOD2_REG 0x0A /* Power Good2 Read */ > > +/* Power Good #2 Register Bit Definitions */ > > +#define ALTR_A10SR_PG2_HPS_SHIFT 7 /* HPS Power Good */ -> > +#define ALTR_A10SR_PG2_HL_HPS_SHIFT 6 /* HILOHPS_VDD Power Good */ +> > +#define ALTR_A10SR_PG2_HL_HPS_SHIFT 6 /* HILOHPS_VDD Power Good +> > */ > > +#define ALTR_A10SR_PG2_HL_VDD_SHIFT 5 /* HILO VDD Power Good */ > > +#define ALTR_A10SR_PG2_HL_VDDQ_SHIFT 4 /* HILO VDDQ Power Good */ > > +#define ALTR_A10SR_PG2_FMCAVADJ_SHIFT 3 /* FMCA VADJ Power Good */ @@ -67,7 +69,8 @@ Change of plan, this should really be squashed into patch 3. > > +#define ALTR_A10SR_PG3_FAM2C_SHIFT 7 /* FAM2C Power Good */ > > +#define ALTR_A10SR_PG3_10V_FAIL_SHIFT 6 /* 10V Fail n */ > > + -> > #define ALTR_A10SR_FMCAB_REG 0x0E /* FMCA/B & PCIe Pwr Enable */ +> > #define ALTR_A10SR_FMCAB_REG 0x0E /* FMCA/B & PCIe Pwr Enable +> > */ > > #define ALTR_A10SR_HPS_RST_REG 0x10 /* HPS Reset */ > > #define ALTR_A10SR_USB_QSPI_REG 0x12 /* USB, BQSPI, FILE Reset */ > @@ -75,9 +78,9 @@ Change of plan, this should really be squashed into patch 3. -- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org │ Open source software for ARM SoCs +Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- -To unsubscribe from this list: send the line "unsubscribe linux-gpio" in -the body of a message to majordomo@vger.kernel.org +To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in +the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index d108a67..afebf39 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,41 +1,27 @@ "ref\01461339219-15255-1-git-send-email-tthayer@opensource.altera.com\0" - "ref\01461339219-15255-10-git-send-email-tthayer@opensource.altera.com\0" - "ref\020160509155353.GD19473@dell\0" "From\0Lee Jones <lee.jones@linaro.org>\0" "Subject\0Re: [PATCH 09/11] mfd: altr_a10sr: Add Altera A10-SR power supply alarms\0" - "Date\0Mon, 9 May 2016 16:56:16 +0100\0" - "To\0tthayer@opensource.altera.com\0" - "Cc\0linus.walleij@linaro.org" - gnurou@gmail.com - jdelvare@suse.com - linux@roeck-us.net - robh+dt@kernel.org - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - dinguyen@opensource.altera.com - linux-gpio@vger.kernel.org - linux-hwmon@vger.kernel.org - " devicetree@vger.kernel.org\0" + "Date\0Mon, 09 May 2016 08:56:54 -0700\0" + "To\0linux-hwmon@vger.kernel.org\0" "\00:1\0" "b\0" "On Mon, 09 May 2016, Lee Jones wrote:\n" "\n" - "> On Fri, 22 Apr 2016, tthayer@opensource.altera.com wrote:\n" + "> On Fri, 22 Apr 2016, ttha...@opensource.altera.com wrote:\n" "> \n" - "> > From: Thor Thayer <tthayer@opensource.altera.com>\n" + "> > From: Thor Thayer <ttha...@opensource.altera.com>\n" "> > \n" "> > Add support for power supply alarms to the Altera Arria10\n" "> > Development Kit System Resource chip.\n" "> > \n" - "> > Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>\n" + "> > Signed-off-by: Thor Thayer <ttha...@opensource.altera.com>\n" "> > ---\n" "> > drivers/mfd/altera-a10sr.c | 4 ++++\n" "> > include/linux/mfd/altera-a10sr.h | 24 ++++++++++++++++++++++++\n" "> > 2 files changed, 28 insertions(+)\n" "> \n" "> For my own reference:\n" - "> Acked-by: Lee Jones <lee.jones@linaro.org>\n" + "> Acked-by: Lee Jones <lee.jo...@linaro.org>\n" "\n" "Change of plan, this should really be squashed into patch 3.\n" "\n" @@ -44,17 +30,18 @@ "> > --- a/drivers/mfd/altera-a10sr.c\n" "> > +++ b/drivers/mfd/altera-a10sr.c\n" "> > @@ -31,6 +31,10 @@ static const struct mfd_cell altr_a10sr_subdev_info[] = {\n" - "> > \t\t.name = \"altr_a10sr_gpio\",\n" - "> > \t\t.of_compatible = \"altr,a10sr-gpio\",\n" - "> > \t},\n" - "> > +\t{\n" - "> > +\t\t.name = \"altr_a10sr_hwmon\",\n" - "> > +\t\t.of_compatible = \"altr,a10sr-hwmon\",\n" - "> > +\t},\n" + "> > .name = \"altr_a10sr_gpio\",\n" + "> > .of_compatible = \"altr,a10sr-gpio\",\n" + "> > },\n" + "> > + {\n" + "> > + .name = \"altr_a10sr_hwmon\",\n" + "> > + .of_compatible = \"altr,a10sr-hwmon\",\n" + "> > + },\n" "> > };\n" "> > \n" "> > static bool altr_a10sr_reg_readable(struct device *dev, unsigned int reg)\n" - "> > diff --git a/include/linux/mfd/altera-a10sr.h b/include/linux/mfd/altera-a10sr.h\n" + "> > diff --git a/include/linux/mfd/altera-a10sr.h \n" + "> > b/include/linux/mfd/altera-a10sr.h\n" "> > index c869fe7..22aa830 100644\n" "> > --- a/include/linux/mfd/altera-a10sr.h\n" "> > +++ b/include/linux/mfd/altera-a10sr.h\n" @@ -75,7 +62,8 @@ "> > #define ALTR_A10SR_PWR_GOOD2_REG 0x0A /* Power Good2 Read */\n" "> > +/* Power Good #2 Register Bit Definitions */\n" "> > +#define ALTR_A10SR_PG2_HPS_SHIFT 7 /* HPS Power Good */\n" - "> > +#define ALTR_A10SR_PG2_HL_HPS_SHIFT 6 /* HILOHPS_VDD Power Good */\n" + "> > +#define ALTR_A10SR_PG2_HL_HPS_SHIFT 6 /* HILOHPS_VDD Power Good \n" + "> > */\n" "> > +#define ALTR_A10SR_PG2_HL_VDD_SHIFT 5 /* HILO VDD Power Good */\n" "> > +#define ALTR_A10SR_PG2_HL_VDDQ_SHIFT 4 /* HILO VDDQ Power Good */\n" "> > +#define ALTR_A10SR_PG2_FMCAVADJ_SHIFT 3 /* FMCA VADJ Power Good */\n" @@ -88,7 +76,8 @@ "> > +#define ALTR_A10SR_PG3_FAM2C_SHIFT 7 /* FAM2C Power Good */\n" "> > +#define ALTR_A10SR_PG3_10V_FAIL_SHIFT 6 /* 10V Fail n */\n" "> > +\n" - "> > #define ALTR_A10SR_FMCAB_REG 0x0E /* FMCA/B & PCIe Pwr Enable */\n" + "> > #define ALTR_A10SR_FMCAB_REG 0x0E /* FMCA/B & PCIe Pwr Enable \n" + "> > */\n" "> > #define ALTR_A10SR_HPS_RST_REG 0x10 /* HPS Reset */\n" "> > #define ALTR_A10SR_USB_QSPI_REG 0x12 /* USB, BQSPI, FILE Reset */\n" "> \n" @@ -96,11 +85,11 @@ "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org \342\224\202 Open source software for ARM SoCs\n" + "Linaro.org \303\242\302\224\302\202 Open source software for ARM SoCs\n" "Follow Linaro: Facebook | Twitter | Blog\n" "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-gpio\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-hwmon\" in\n" + "the body of a message to majord...@vger.kernel.org\n" More majordomo info at http://vger.kernel.org/majordomo-info.html -6d10f028f2878af8283015beaa8dd03b8c38244d0af87947fd4be0524496868f +fe6e353f445df5872067152bd275537c720679f46dc9d1500d5c86be55406bb2
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.