diff for duplicates of <1471612164.2691.73.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 9031570..11cc5dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On 三, 2016-07-27 at 22:10 +0800, Caesar Wang wrote: +On ?, 2016-07-27 at 22:10 +0800, Caesar Wang wrote: > From: Rocky Hao <rocky.hao@rock-chips.com> > > Due to the voltage ripple, the sensing data of the tsadc is not @@ -14,7 +14,7 @@ On 三, 2016-07-27 at 22:10 +0800, Caesar Wang wrote: > Cc: Eduardo Valentin <edubezval@gmail.com> > Cc: Zhang Rui <rui.zhang@intel.com> > Cc: Heiko Stuebner <heiko@sntech.de> -> Cc: linux-pm@vger.kernel.org +> Cc: linux-pm at vger.kernel.org Both patches applied and queued for 4.9. @@ -22,8 +22,8 @@ thanks, rui > --- > -> drivers/thermal/rockchip_thermal.c | 11 ++++++----- -> 1 file changed, 6 insertions(+), 5 deletions(-) +> ?drivers/thermal/rockchip_thermal.c | 11 ++++++----- +> ?1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/thermal/rockchip_thermal.c > b/drivers/thermal/rockchip_thermal.c @@ -31,23 +31,23 @@ rui > --- a/drivers/thermal/rockchip_thermal.c > +++ b/drivers/thermal/rockchip_thermal.c > @@ -222,10 +222,10 @@ struct rockchip_thermal_data { -> #define GRF_TSADC_TESTBIT_L 0x0e648 -> #define GRF_TSADC_TESTBIT_H 0x0e64c -> +> ?#define GRF_TSADC_TESTBIT_L 0x0e648 +> ?#define GRF_TSADC_TESTBIT_H 0x0e64c +> ? > -#define GRF_TSADC_TSEN_PD_ON (0x30003 << 0) > -#define GRF_TSADC_TSEN_PD_OFF (0x30000 << 0) -> #define GRF_SARADC_TESTBIT_ON (0x10001 << 2) -> #define GRF_TSADC_TESTBIT_H_ON (0x10001 << 2) +> ?#define GRF_SARADC_TESTBIT_ON (0x10001 << 2) +> ?#define GRF_TSADC_TESTBIT_H_ON (0x10001 << 2) > +#define GRF_TSADC_VCM_EN_L (0x10001 << 7) > +#define GRF_TSADC_VCM_EN_H (0x10001 << 7) -> -> /** -> * struct tsadc_table - code to temperature conversion table +> ? +> ?/** +> ? * struct tsadc_table - code to temperature conversion table > @@ -567,9 +567,10 @@ static void rk_tsadcv3_initialize(struct regmap > *grf, void __iomem *regs, -> regs + TSADCV2_HIGHT_TSHUT_DEBOUNCE); -> -> } else { +> ? ???????regs + TSADCV2_HIGHT_TSHUT_DEBOUNCE); +> ? +> ? } else { > - regmap_write(grf, GRF_TSADC_TESTBIT_L, > GRF_TSADC_TSEN_PD_ON); > - mdelay(10); @@ -59,9 +59,9 @@ rui > + regmap_write(grf, GRF_TSADC_TESTBIT_H, > GRF_TSADC_VCM_EN_H); > + -> usleep_range(15, 100); /* The spec note says at +> ? usleep_range(15, 100); /* The spec note says at > least 15 us */ -> regmap_write(grf, GRF_SARADC_TESTBIT, +> ? regmap_write(grf, GRF_SARADC_TESTBIT, > GRF_SARADC_TESTBIT_ON); -> regmap_write(grf, GRF_TSADC_TESTBIT_H, +> ? regmap_write(grf, GRF_TSADC_TESTBIT_H, > GRF_TSADC_TESTBIT_H_ON); diff --git a/a/content_digest b/N1/content_digest index bd204b5..f806848 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,11 @@ "ref\01469628643-29661-1-git-send-email-wxt@rock-chips.com\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH 1/2] thermal: rockchip: enhance the tsadc's bandgap feature for rk3399\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH 1/2] thermal: rockchip: enhance the tsadc's bandgap feature for rk3399\0" "Date\0Fri, 19 Aug 2016 21:09:24 +0800\0" - "To\0Caesar Wang <wxt@rock-chips.com>" - " Eduardo Valentin <edubezval@gmail.com>\0" - "Cc\0smbarber@chromium.org" - dianders@chromium.org - briannorris@chromium.org - Rocky Hao <rocky.hao@rock-chips.com> - Heiko Stuebner <heiko@sntech.de> - linux-pm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-rockchip@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On \344\270\211, 2016-07-27 at 22:10 +0800, Caesar Wang wrote:\n" + "On ?, 2016-07-27 at 22:10 +0800, Caesar Wang wrote:\n" "> From: Rocky Hao <rocky.hao@rock-chips.com>\n" "> \n" "> Due to the voltage ripple, the sensing data of the tsadc is not\n" @@ -31,7 +21,7 @@ "> Cc: Eduardo Valentin <edubezval@gmail.com>\n" "> Cc: Zhang Rui <rui.zhang@intel.com>\n" "> Cc: Heiko Stuebner <heiko@sntech.de>\n" - "> Cc: linux-pm@vger.kernel.org\n" + "> Cc: linux-pm at vger.kernel.org\n" "\n" "Both patches applied and queued for 4.9.\n" "\n" @@ -39,8 +29,8 @@ "rui\n" "> ---\n" "> \n" - "> \302\240drivers/thermal/rockchip_thermal.c | 11 ++++++-----\n" - "> \302\2401 file changed, 6 insertions(+), 5 deletions(-)\n" + "> ?drivers/thermal/rockchip_thermal.c | 11 ++++++-----\n" + "> ?1 file changed, 6 insertions(+), 5 deletions(-)\n" "> \n" "> diff --git a/drivers/thermal/rockchip_thermal.c\n" "> b/drivers/thermal/rockchip_thermal.c\n" @@ -48,23 +38,23 @@ "> --- a/drivers/thermal/rockchip_thermal.c\n" "> +++ b/drivers/thermal/rockchip_thermal.c\n" "> @@ -222,10 +222,10 @@ struct rockchip_thermal_data {\n" - "> \302\240#define GRF_TSADC_TESTBIT_L\t\t\t0x0e648\n" - "> \302\240#define GRF_TSADC_TESTBIT_H\t\t\t0x0e64c\n" - "> \302\240\n" + "> ?#define GRF_TSADC_TESTBIT_L\t\t\t0x0e648\n" + "> ?#define GRF_TSADC_TESTBIT_H\t\t\t0x0e64c\n" + "> ?\n" "> -#define GRF_TSADC_TSEN_PD_ON\t\t\t(0x30003 << 0)\n" "> -#define GRF_TSADC_TSEN_PD_OFF\t\t\t(0x30000 << 0)\n" - "> \302\240#define GRF_SARADC_TESTBIT_ON\t\t\t(0x10001 << 2)\n" - "> \302\240#define GRF_TSADC_TESTBIT_H_ON\t\t\t(0x10001 << 2)\n" + "> ?#define GRF_SARADC_TESTBIT_ON\t\t\t(0x10001 << 2)\n" + "> ?#define GRF_TSADC_TESTBIT_H_ON\t\t\t(0x10001 << 2)\n" "> +#define GRF_TSADC_VCM_EN_L\t\t\t(0x10001 << 7)\n" "> +#define GRF_TSADC_VCM_EN_H\t\t\t(0x10001 << 7)\n" - "> \302\240\n" - "> \302\240/**\n" - "> \302\240 * struct tsadc_table - code to temperature conversion table\n" + "> ?\n" + "> ?/**\n" + "> ? * struct tsadc_table - code to temperature conversion table\n" "> @@ -567,9 +567,10 @@ static void rk_tsadcv3_initialize(struct regmap\n" "> *grf, void __iomem *regs,\n" - "> \302\240\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240regs + TSADCV2_HIGHT_TSHUT_DEBOUNCE);\n" - "> \302\240\n" - "> \302\240\t} else {\n" + "> ?\t\t\t???????regs + TSADCV2_HIGHT_TSHUT_DEBOUNCE);\n" + "> ?\n" + "> ?\t} else {\n" "> -\t\tregmap_write(grf, GRF_TSADC_TESTBIT_L,\n" "> GRF_TSADC_TSEN_PD_ON);\n" "> -\t\tmdelay(10);\n" @@ -76,11 +66,11 @@ "> +\t\tregmap_write(grf, GRF_TSADC_TESTBIT_H,\n" "> GRF_TSADC_VCM_EN_H);\n" "> +\n" - "> \302\240\t\tusleep_range(15, 100); /* The spec note says at\n" + "> ?\t\tusleep_range(15, 100); /* The spec note says at\n" "> least 15 us */\n" - "> \302\240\t\tregmap_write(grf, GRF_SARADC_TESTBIT,\n" + "> ?\t\tregmap_write(grf, GRF_SARADC_TESTBIT,\n" "> GRF_SARADC_TESTBIT_ON);\n" - "> \302\240\t\tregmap_write(grf, GRF_TSADC_TESTBIT_H,\n" + "> ?\t\tregmap_write(grf, GRF_TSADC_TESTBIT_H,\n" > GRF_TSADC_TESTBIT_H_ON); -4822c3df30b7cddb51bfc5149c34881c047f4fe577fc047df67df77a14474aba +24e47c175fd8ff6869aa3c10fe7f122300a0327be827eea99e0a8f32cdfcab24
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.