| Message ID | 1380010102-25817-5-git-send-email-l.majewski@samsung.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Eduardo Valentin |
| Headers | show |
On Tue, Sep 24, 2013 at 1:38 PM, Lukasz Majewski <l.majewski@samsung.com> wrote: > The TMU data definition is now separated to Exynos4412 and Exynos5250. > > Now SOC_ARCH_EXYNOS only refers to Exynos5250. Hence the name > SOC_ARCH_EXYNOS has been changed to SOC_ARCH_EXYNOS5250. > > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Changes looks fine. Reviewed-by: Amit Daniel Kachhap<amit.daniel@samsung.com> Thanks, Amit > --- > drivers/thermal/samsung/exynos_tmu.c | 4 ++-- > drivers/thermal/samsung/exynos_tmu.h | 2 +- > drivers/thermal/samsung/exynos_tmu_data.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c > index 21b89e4..037cd46 100644 > --- a/drivers/thermal/samsung/exynos_tmu.c > +++ b/drivers/thermal/samsung/exynos_tmu.c > @@ -632,9 +632,9 @@ static int exynos_tmu_probe(struct platform_device *pdev) > if (ret) > return ret; > > - if (pdata->type == SOC_ARCH_EXYNOS || > - pdata->type == SOC_ARCH_EXYNOS4210 || > + if (pdata->type == SOC_ARCH_EXYNOS4210 || > pdata->type == SOC_ARCH_EXYNOS4412 || > + pdata->type == SOC_ARCH_EXYNOS5250 || > pdata->type == SOC_ARCH_EXYNOS5440) > data->soc = pdata->type; > else { > diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h > index db37df0..b42ece4 100644 > --- a/drivers/thermal/samsung/exynos_tmu.h > +++ b/drivers/thermal/samsung/exynos_tmu.h > @@ -42,7 +42,7 @@ enum calibration_mode { > enum soc_type { > SOC_ARCH_EXYNOS4210 = 1, > SOC_ARCH_EXYNOS4412, > - SOC_ARCH_EXYNOS, > + SOC_ARCH_EXYNOS5250, > SOC_ARCH_EXYNOS5440, > }; > > diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c > index bd08093..188223f 100644 > --- a/drivers/thermal/samsung/exynos_tmu_data.c > +++ b/drivers/thermal/samsung/exynos_tmu_data.c > @@ -183,7 +183,7 @@ struct exynos_tmu_init_data const exynos4412_default_tmu_data = { > struct exynos_tmu_init_data const exynos5250_default_tmu_data = { > .tmu_data = { > { EXYNOS4412_TMU_DATA, > - .type = SOC_ARCH_EXYNOS, > + .type = SOC_ARCH_EXYNOS5250, > }, > }, > .tmu_count = 1, > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 24-09-2013 04:08, Lukasz Majewski wrote: > The TMU data definition is now separated to Exynos4412 and Exynos5250. > > Now SOC_ARCH_EXYNOS only refers to Exynos5250. Hence the name > SOC_ARCH_EXYNOS has been changed to SOC_ARCH_EXYNOS5250. > How about merging this one with patch 02? > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> > --- > drivers/thermal/samsung/exynos_tmu.c | 4 ++-- > drivers/thermal/samsung/exynos_tmu.h | 2 +- > drivers/thermal/samsung/exynos_tmu_data.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c > index 21b89e4..037cd46 100644 > --- a/drivers/thermal/samsung/exynos_tmu.c > +++ b/drivers/thermal/samsung/exynos_tmu.c > @@ -632,9 +632,9 @@ static int exynos_tmu_probe(struct platform_device *pdev) > if (ret) > return ret; > > - if (pdata->type == SOC_ARCH_EXYNOS || > - pdata->type == SOC_ARCH_EXYNOS4210 || > + if (pdata->type == SOC_ARCH_EXYNOS4210 || > pdata->type == SOC_ARCH_EXYNOS4412 || > + pdata->type == SOC_ARCH_EXYNOS5250 || > pdata->type == SOC_ARCH_EXYNOS5440) > data->soc = pdata->type; > else { > diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h > index db37df0..b42ece4 100644 > --- a/drivers/thermal/samsung/exynos_tmu.h > +++ b/drivers/thermal/samsung/exynos_tmu.h > @@ -42,7 +42,7 @@ enum calibration_mode { > enum soc_type { > SOC_ARCH_EXYNOS4210 = 1, > SOC_ARCH_EXYNOS4412, > - SOC_ARCH_EXYNOS, > + SOC_ARCH_EXYNOS5250, > SOC_ARCH_EXYNOS5440, > }; > > diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c > index bd08093..188223f 100644 > --- a/drivers/thermal/samsung/exynos_tmu_data.c > +++ b/drivers/thermal/samsung/exynos_tmu_data.c > @@ -183,7 +183,7 @@ struct exynos_tmu_init_data const exynos4412_default_tmu_data = { > struct exynos_tmu_init_data const exynos5250_default_tmu_data = { > .tmu_data = { > { EXYNOS4412_TMU_DATA, > - .type = SOC_ARCH_EXYNOS, > + .type = SOC_ARCH_EXYNOS5250, > }, > }, > .tmu_count = 1, >
Hi, On Thursday, October 03, 2013 06:08:45 PM Eduardo Valentin wrote: > On 24-09-2013 04:08, Lukasz Majewski wrote: > > The TMU data definition is now separated to Exynos4412 and Exynos5250. > > > > Now SOC_ARCH_EXYNOS only refers to Exynos5250. Hence the name > > SOC_ARCH_EXYNOS has been changed to SOC_ARCH_EXYNOS5250. > > > > How about merging this one with patch 02? I would prefer that this is not done since patch #2 is a separate logical change and it should be kept as a minimal preparatory patch for patch #3 (which is an important bugfix) to make potential backporting of fixes into -stable etc. easier. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> > > --- > > drivers/thermal/samsung/exynos_tmu.c | 4 ++-- > > drivers/thermal/samsung/exynos_tmu.h | 2 +- > > drivers/thermal/samsung/exynos_tmu_data.c | 2 +- > > 3 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c > > index 21b89e4..037cd46 100644 > > --- a/drivers/thermal/samsung/exynos_tmu.c > > +++ b/drivers/thermal/samsung/exynos_tmu.c > > @@ -632,9 +632,9 @@ static int exynos_tmu_probe(struct platform_device *pdev) > > if (ret) > > return ret; > > > > - if (pdata->type == SOC_ARCH_EXYNOS || > > - pdata->type == SOC_ARCH_EXYNOS4210 || > > + if (pdata->type == SOC_ARCH_EXYNOS4210 || > > pdata->type == SOC_ARCH_EXYNOS4412 || > > + pdata->type == SOC_ARCH_EXYNOS5250 || > > pdata->type == SOC_ARCH_EXYNOS5440) > > data->soc = pdata->type; > > else { > > diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h > > index db37df0..b42ece4 100644 > > --- a/drivers/thermal/samsung/exynos_tmu.h > > +++ b/drivers/thermal/samsung/exynos_tmu.h > > @@ -42,7 +42,7 @@ enum calibration_mode { > > enum soc_type { > > SOC_ARCH_EXYNOS4210 = 1, > > SOC_ARCH_EXYNOS4412, > > - SOC_ARCH_EXYNOS, > > + SOC_ARCH_EXYNOS5250, > > SOC_ARCH_EXYNOS5440, > > }; > > > > diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c > > index bd08093..188223f 100644 > > --- a/drivers/thermal/samsung/exynos_tmu_data.c > > +++ b/drivers/thermal/samsung/exynos_tmu_data.c > > @@ -183,7 +183,7 @@ struct exynos_tmu_init_data const exynos4412_default_tmu_data = { > > struct exynos_tmu_init_data const exynos5250_default_tmu_data = { > > .tmu_data = { > > { EXYNOS4412_TMU_DATA, > > - .type = SOC_ARCH_EXYNOS, > > + .type = SOC_ARCH_EXYNOS5250, > > }, > > }, > > .tmu_count = 1, -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Eduardo, > On 24-09-2013 04:08, Lukasz Majewski wrote: > > The TMU data definition is now separated to Exynos4412 and > > Exynos5250. > > > > Now SOC_ARCH_EXYNOS only refers to Exynos5250. Hence the name > > SOC_ARCH_EXYNOS has been changed to SOC_ARCH_EXYNOS5250. > > > > How about merging this one with patch 02? I wanted to show how the work was logically split - patch 02 extracts Exynos4412 from Exynos5250. Then this patch changes the name. I will merge those two patches. No problem. > > > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> > > --- > > drivers/thermal/samsung/exynos_tmu.c | 4 ++-- > > drivers/thermal/samsung/exynos_tmu.h | 2 +- > > drivers/thermal/samsung/exynos_tmu_data.c | 2 +- > > 3 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/thermal/samsung/exynos_tmu.c > > b/drivers/thermal/samsung/exynos_tmu.c index 21b89e4..037cd46 100644 > > --- a/drivers/thermal/samsung/exynos_tmu.c > > +++ b/drivers/thermal/samsung/exynos_tmu.c > > @@ -632,9 +632,9 @@ static int exynos_tmu_probe(struct > > platform_device *pdev) if (ret) > > return ret; > > > > - if (pdata->type == SOC_ARCH_EXYNOS || > > - pdata->type == SOC_ARCH_EXYNOS4210 || > > + if (pdata->type == SOC_ARCH_EXYNOS4210 || > > pdata->type == SOC_ARCH_EXYNOS4412 || > > + pdata->type == SOC_ARCH_EXYNOS5250 || > > pdata->type == SOC_ARCH_EXYNOS5440) > > data->soc = pdata->type; > > else { > > diff --git a/drivers/thermal/samsung/exynos_tmu.h > > b/drivers/thermal/samsung/exynos_tmu.h index db37df0..b42ece4 100644 > > --- a/drivers/thermal/samsung/exynos_tmu.h > > +++ b/drivers/thermal/samsung/exynos_tmu.h > > @@ -42,7 +42,7 @@ enum calibration_mode { > > enum soc_type { > > SOC_ARCH_EXYNOS4210 = 1, > > SOC_ARCH_EXYNOS4412, > > - SOC_ARCH_EXYNOS, > > + SOC_ARCH_EXYNOS5250, > > SOC_ARCH_EXYNOS5440, > > }; > > > > diff --git a/drivers/thermal/samsung/exynos_tmu_data.c > > b/drivers/thermal/samsung/exynos_tmu_data.c index bd08093..188223f > > 100644 --- a/drivers/thermal/samsung/exynos_tmu_data.c > > +++ b/drivers/thermal/samsung/exynos_tmu_data.c > > @@ -183,7 +183,7 @@ struct exynos_tmu_init_data const > > exynos4412_default_tmu_data = { struct exynos_tmu_init_data const > > exynos5250_default_tmu_data = { .tmu_data = { > > { EXYNOS4412_TMU_DATA, > > - .type = SOC_ARCH_EXYNOS, > > + .type = SOC_ARCH_EXYNOS5250, > > }, > > }, > > .tmu_count = 1, > > > >
On Friday, October 04, 2013 12:23:30 PM Lukasz Majewski wrote: > Hi Eduardo, > > > On 24-09-2013 04:08, Lukasz Majewski wrote: > > > The TMU data definition is now separated to Exynos4412 and > > > Exynos5250. > > > > > > Now SOC_ARCH_EXYNOS only refers to Exynos5250. Hence the name > > > SOC_ARCH_EXYNOS has been changed to SOC_ARCH_EXYNOS5250. > > > > > > > How about merging this one with patch 02? > > I wanted to show how the work was logically split - patch 02 > extracts Exynos4412 from Exynos5250. Then this patch changes the name. > > I will merge those two patches. No problem. Oh, well. Looking at the patch #2 again the merge can be done without sacrificing backportability. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > > > > > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> > > > --- > > > drivers/thermal/samsung/exynos_tmu.c | 4 ++-- > > > drivers/thermal/samsung/exynos_tmu.h | 2 +- > > > drivers/thermal/samsung/exynos_tmu_data.c | 2 +- > > > 3 files changed, 4 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/thermal/samsung/exynos_tmu.c > > > b/drivers/thermal/samsung/exynos_tmu.c index 21b89e4..037cd46 100644 > > > --- a/drivers/thermal/samsung/exynos_tmu.c > > > +++ b/drivers/thermal/samsung/exynos_tmu.c > > > @@ -632,9 +632,9 @@ static int exynos_tmu_probe(struct > > > platform_device *pdev) if (ret) > > > return ret; > > > > > > - if (pdata->type == SOC_ARCH_EXYNOS || > > > - pdata->type == SOC_ARCH_EXYNOS4210 || > > > + if (pdata->type == SOC_ARCH_EXYNOS4210 || > > > pdata->type == SOC_ARCH_EXYNOS4412 || > > > + pdata->type == SOC_ARCH_EXYNOS5250 || > > > pdata->type == SOC_ARCH_EXYNOS5440) > > > data->soc = pdata->type; > > > else { > > > diff --git a/drivers/thermal/samsung/exynos_tmu.h > > > b/drivers/thermal/samsung/exynos_tmu.h index db37df0..b42ece4 100644 > > > --- a/drivers/thermal/samsung/exynos_tmu.h > > > +++ b/drivers/thermal/samsung/exynos_tmu.h > > > @@ -42,7 +42,7 @@ enum calibration_mode { > > > enum soc_type { > > > SOC_ARCH_EXYNOS4210 = 1, > > > SOC_ARCH_EXYNOS4412, > > > - SOC_ARCH_EXYNOS, > > > + SOC_ARCH_EXYNOS5250, > > > SOC_ARCH_EXYNOS5440, > > > }; > > > > > > diff --git a/drivers/thermal/samsung/exynos_tmu_data.c > > > b/drivers/thermal/samsung/exynos_tmu_data.c index bd08093..188223f > > > 100644 --- a/drivers/thermal/samsung/exynos_tmu_data.c > > > +++ b/drivers/thermal/samsung/exynos_tmu_data.c > > > @@ -183,7 +183,7 @@ struct exynos_tmu_init_data const > > > exynos4412_default_tmu_data = { struct exynos_tmu_init_data const > > > exynos5250_default_tmu_data = { .tmu_data = { > > > { EXYNOS4412_TMU_DATA, > > > - .type = SOC_ARCH_EXYNOS, > > > + .type = SOC_ARCH_EXYNOS5250, > > > }, > > > }, > > > .tmu_count = 1, -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04-10-2013 06:47, Bartlomiej Zolnierkiewicz wrote: > On Friday, October 04, 2013 12:23:30 PM Lukasz Majewski wrote: >> Hi Eduardo, >> >>> On 24-09-2013 04:08, Lukasz Majewski wrote: >>>> The TMU data definition is now separated to Exynos4412 and >>>> Exynos5250. >>>> >>>> Now SOC_ARCH_EXYNOS only refers to Exynos5250. Hence the name >>>> SOC_ARCH_EXYNOS has been changed to SOC_ARCH_EXYNOS5250. >>>> >>> >>> How about merging this one with patch 02? >> >> I wanted to show how the work was logically split - patch 02 >> extracts Exynos4412 from Exynos5250. Then this patch changes the name. >> >> I will merge those two patches. No problem. > > Oh, well. Looking at the patch #2 again the merge can be done without > sacrificing backportability. Please, merge them and describe that you are reworking the type and the enum definition. Also add your reasonings, specially if you found bugs. The way the descriptions are being presented, the bugs you found do not get properly explained. > > Best regards, > -- > Bartlomiej Zolnierkiewicz > Samsung R&D Institute Poland > Samsung Electronics > >>> >>>> Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> >>>> --- >>>> drivers/thermal/samsung/exynos_tmu.c | 4 ++-- >>>> drivers/thermal/samsung/exynos_tmu.h | 2 +- >>>> drivers/thermal/samsung/exynos_tmu_data.c | 2 +- >>>> 3 files changed, 4 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/drivers/thermal/samsung/exynos_tmu.c >>>> b/drivers/thermal/samsung/exynos_tmu.c index 21b89e4..037cd46 100644 >>>> --- a/drivers/thermal/samsung/exynos_tmu.c >>>> +++ b/drivers/thermal/samsung/exynos_tmu.c >>>> @@ -632,9 +632,9 @@ static int exynos_tmu_probe(struct >>>> platform_device *pdev) if (ret) >>>> return ret; >>>> >>>> - if (pdata->type == SOC_ARCH_EXYNOS || >>>> - pdata->type == SOC_ARCH_EXYNOS4210 || >>>> + if (pdata->type == SOC_ARCH_EXYNOS4210 || >>>> pdata->type == SOC_ARCH_EXYNOS4412 || >>>> + pdata->type == SOC_ARCH_EXYNOS5250 || >>>> pdata->type == SOC_ARCH_EXYNOS5440) >>>> data->soc = pdata->type; >>>> else { >>>> diff --git a/drivers/thermal/samsung/exynos_tmu.h >>>> b/drivers/thermal/samsung/exynos_tmu.h index db37df0..b42ece4 100644 >>>> --- a/drivers/thermal/samsung/exynos_tmu.h >>>> +++ b/drivers/thermal/samsung/exynos_tmu.h >>>> @@ -42,7 +42,7 @@ enum calibration_mode { >>>> enum soc_type { >>>> SOC_ARCH_EXYNOS4210 = 1, >>>> SOC_ARCH_EXYNOS4412, >>>> - SOC_ARCH_EXYNOS, >>>> + SOC_ARCH_EXYNOS5250, >>>> SOC_ARCH_EXYNOS5440, >>>> }; >>>> >>>> diff --git a/drivers/thermal/samsung/exynos_tmu_data.c >>>> b/drivers/thermal/samsung/exynos_tmu_data.c index bd08093..188223f >>>> 100644 --- a/drivers/thermal/samsung/exynos_tmu_data.c >>>> +++ b/drivers/thermal/samsung/exynos_tmu_data.c >>>> @@ -183,7 +183,7 @@ struct exynos_tmu_init_data const >>>> exynos4412_default_tmu_data = { struct exynos_tmu_init_data const >>>> exynos5250_default_tmu_data = { .tmu_data = { >>>> { EXYNOS4412_TMU_DATA, >>>> - .type = SOC_ARCH_EXYNOS, >>>> + .type = SOC_ARCH_EXYNOS5250, >>>> }, >>>> }, >>>> .tmu_count = 1, > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > >
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 21b89e4..037cd46 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -632,9 +632,9 @@ static int exynos_tmu_probe(struct platform_device *pdev) if (ret) return ret; - if (pdata->type == SOC_ARCH_EXYNOS || - pdata->type == SOC_ARCH_EXYNOS4210 || + if (pdata->type == SOC_ARCH_EXYNOS4210 || pdata->type == SOC_ARCH_EXYNOS4412 || + pdata->type == SOC_ARCH_EXYNOS5250 || pdata->type == SOC_ARCH_EXYNOS5440) data->soc = pdata->type; else { diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h index db37df0..b42ece4 100644 --- a/drivers/thermal/samsung/exynos_tmu.h +++ b/drivers/thermal/samsung/exynos_tmu.h @@ -42,7 +42,7 @@ enum calibration_mode { enum soc_type { SOC_ARCH_EXYNOS4210 = 1, SOC_ARCH_EXYNOS4412, - SOC_ARCH_EXYNOS, + SOC_ARCH_EXYNOS5250, SOC_ARCH_EXYNOS5440, }; diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c index bd08093..188223f 100644 --- a/drivers/thermal/samsung/exynos_tmu_data.c +++ b/drivers/thermal/samsung/exynos_tmu_data.c @@ -183,7 +183,7 @@ struct exynos_tmu_init_data const exynos4412_default_tmu_data = { struct exynos_tmu_init_data const exynos5250_default_tmu_data = { .tmu_data = { { EXYNOS4412_TMU_DATA, - .type = SOC_ARCH_EXYNOS, + .type = SOC_ARCH_EXYNOS5250, }, }, .tmu_count = 1,
The TMU data definition is now separated to Exynos4412 and Exynos5250. Now SOC_ARCH_EXYNOS only refers to Exynos5250. Hence the name SOC_ARCH_EXYNOS has been changed to SOC_ARCH_EXYNOS5250. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> --- drivers/thermal/samsung/exynos_tmu.c | 4 ++-- drivers/thermal/samsung/exynos_tmu.h | 2 +- drivers/thermal/samsung/exynos_tmu_data.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)