diff for duplicates of <1502420573.2598.7.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 6d8060f..e592947 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,9 +12,9 @@ thanks, rui > --- -> drivers/thermal/rockchip_thermal.c | 65 +> ?drivers/thermal/rockchip_thermal.c | 65 > ++++++++++++++++++++++++++++++++++++++ -> 1 file changed, 65 insertions(+) +> ?1 file changed, 65 insertions(+) > > diff --git a/drivers/thermal/rockchip_thermal.c > b/drivers/thermal/rockchip_thermal.c @@ -22,9 +22,9 @@ rui > --- a/drivers/thermal/rockchip_thermal.c > +++ b/drivers/thermal/rockchip_thermal.c > @@ -320,6 +320,44 @@ struct tsadc_table { -> {0, 125000}, -> }; -> +> ? {0, 125000}, +> ?}; +> ? > +static const struct tsadc_table rk3328_code_table[] = { > + {0, -40000}, > + {296, -40000}, @@ -63,14 +63,14 @@ rui > + {TSADCV2_DATA_MASK, 125000}, > +}; > + -> static const struct tsadc_table rk3368_code_table[] = { -> {0, -40000}, -> {106, -40000}, +> ?static const struct tsadc_table rk3368_code_table[] = { +> ? {0, -40000}, +> ? {106, -40000}, > @@ -790,6 +828,29 @@ static void rk_tsadcv2_tshut_mode(int chn, void > __iomem *regs, -> }, -> }; -> +> ? }, +> ?}; +> ? > +static const struct rockchip_tsadc_chip rk3328_tsadc_data = { > + .chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */ > + .chn_num = 1, /* one channels for tsadc */ @@ -94,18 +94,18 @@ rui > + }, > +}; > + -> static const struct rockchip_tsadc_chip rk3366_tsadc_data = { -> .chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */ -> .chn_id[SENSOR_GPU] = 1, /* gpu sensor is channel 1 */ +> ?static const struct rockchip_tsadc_chip rk3366_tsadc_data = { +> ? .chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */ +> ? .chn_id[SENSOR_GPU] = 1, /* gpu sensor is channel 1 */ > @@ -875,6 +936,10 @@ static void rk_tsadcv2_tshut_mode(int chn, void > __iomem *regs, -> .data = (void *)&rk3288_tsadc_data, -> }, -> { +> ? .data = (void *)&rk3288_tsadc_data, +> ? }, +> ? { > + .compatible = "rockchip,rk3328-tsadc", > + .data = (void *)&rk3328_tsadc_data, > + }, > + { -> .compatible = "rockchip,rk3366-tsadc", -> .data = (void *)&rk3366_tsadc_data, -> }, +> ? .compatible = "rockchip,rk3366-tsadc", +> ? .data = (void *)&rk3366_tsadc_data, +> ? }, diff --git a/a/content_digest b/N1/content_digest index f2cfa7c..534aa97 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,27 +1,9 @@ "ref\01500973788-14627-1-git-send-email-rocky.hao@rock-chips.com\0" "ref\01500973788-14627-3-git-send-email-rocky.hao@rock-chips.com\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH 2/5] thermal: rockchip: Support the RK3328 SOC in thermal driver\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH 2/5] thermal: rockchip: Support the RK3328 SOC in thermal driver\0" "Date\0Fri, 11 Aug 2017 11:02:53 +0800\0" - "To\0Rocky Hao <rocky.hao@rock-chips.com>" - edubezval@gmail.com - heiko@sntech.de - robh+dt@kernel.org - mark.rutland@arm.com - catalin.marinas@arm.com - " will.deacon@arm.com\0" - "Cc\0shawn.lin@rock-chips.com" - cl@rock-chips.com - william.wu@rock-chips.com - linux-pm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-rockchip@lists.infradead.org - linux-kernel@vger.kernel.org - devicetree@vger.kernel.org - xxx@rock-chips.com - jay.xu@rock-chips.com - wxt@rock-chips.com - " huangtao@rock-chips.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2017-07-25 at 17:09 +0800, Rocky Hao wrote:\n" @@ -38,9 +20,9 @@ "rui\n" "\n" "> ---\n" - "> \302\240drivers/thermal/rockchip_thermal.c | 65\n" + "> ?drivers/thermal/rockchip_thermal.c | 65\n" "> ++++++++++++++++++++++++++++++++++++++\n" - "> \302\2401 file changed, 65 insertions(+)\n" + "> ?1 file changed, 65 insertions(+)\n" "> \n" "> diff --git a/drivers/thermal/rockchip_thermal.c\n" "> b/drivers/thermal/rockchip_thermal.c\n" @@ -48,9 +30,9 @@ "> --- a/drivers/thermal/rockchip_thermal.c\n" "> +++ b/drivers/thermal/rockchip_thermal.c\n" "> @@ -320,6 +320,44 @@ struct tsadc_table {\n" - "> \302\240\t{0, 125000},\n" - "> \302\240};\n" - "> \302\240\n" + "> ?\t{0, 125000},\n" + "> ?};\n" + "> ?\n" "> +static const struct tsadc_table rk3328_code_table[] = {\n" "> +\t{0, -40000},\n" "> +\t{296, -40000},\n" @@ -89,14 +71,14 @@ "> +\t{TSADCV2_DATA_MASK, 125000},\n" "> +};\n" "> +\n" - "> \302\240static const struct tsadc_table rk3368_code_table[] = {\n" - "> \302\240\t{0, -40000},\n" - "> \302\240\t{106, -40000},\n" + "> ?static const struct tsadc_table rk3368_code_table[] = {\n" + "> ?\t{0, -40000},\n" + "> ?\t{106, -40000},\n" "> @@ -790,6 +828,29 @@ static void rk_tsadcv2_tshut_mode(int chn, void\n" "> __iomem *regs,\n" - "> \302\240\t},\n" - "> \302\240};\n" - "> \302\240\n" + "> ?\t},\n" + "> ?};\n" + "> ?\n" "> +static const struct rockchip_tsadc_chip rk3328_tsadc_data = {\n" "> +\t.chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */\n" "> +\t.chn_num = 1, /* one channels for tsadc */\n" @@ -120,20 +102,20 @@ "> +\t},\n" "> +};\n" "> +\n" - "> \302\240static const struct rockchip_tsadc_chip rk3366_tsadc_data = {\n" - "> \302\240\t.chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */\n" - "> \302\240\t.chn_id[SENSOR_GPU] = 1, /* gpu sensor is channel 1 */\n" + "> ?static const struct rockchip_tsadc_chip rk3366_tsadc_data = {\n" + "> ?\t.chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */\n" + "> ?\t.chn_id[SENSOR_GPU] = 1, /* gpu sensor is channel 1 */\n" "> @@ -875,6 +936,10 @@ static void rk_tsadcv2_tshut_mode(int chn, void\n" "> __iomem *regs,\n" - "> \302\240\t\t.data = (void *)&rk3288_tsadc_data,\n" - "> \302\240\t},\n" - "> \302\240\t{\n" + "> ?\t\t.data = (void *)&rk3288_tsadc_data,\n" + "> ?\t},\n" + "> ?\t{\n" "> +\t\t.compatible = \"rockchip,rk3328-tsadc\",\n" "> +\t\t.data = (void *)&rk3328_tsadc_data,\n" "> +\t},\n" "> +\t{\n" - "> \302\240\t\t.compatible = \"rockchip,rk3366-tsadc\",\n" - "> \302\240\t\t.data = (void *)&rk3366_tsadc_data,\n" - "> \302\240\t}," + "> ?\t\t.compatible = \"rockchip,rk3366-tsadc\",\n" + "> ?\t\t.data = (void *)&rk3366_tsadc_data,\n" + "> ?\t}," -63e740edf9ba871ecd6faba0ccfcc3f6a877ac9027fde504514b4e2536b36fbe +e998d0f0b5d7c4ebfd7d99aca0f1434f1d1d5b7dccdad65cf7d42eac9fc754ad
diff --git a/a/content_digest b/N2/content_digest index f2cfa7c..e8f378a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -9,7 +9,8 @@ robh+dt@kernel.org mark.rutland@arm.com catalin.marinas@arm.com - " will.deacon@arm.com\0" + will.deacon@arm.com + " wxt@rock-chips.com\0" "Cc\0shawn.lin@rock-chips.com" cl@rock-chips.com william.wu@rock-chips.com @@ -136,4 +137,4 @@ "> \302\240\t\t.data = (void *)&rk3366_tsadc_data,\n" "> \302\240\t}," -63e740edf9ba871ecd6faba0ccfcc3f6a877ac9027fde504514b4e2536b36fbe +ff27bdfdc4eeaaa57ffe9b9bcde19392ac7f39ec450504f649e5a4d950269666
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.