The following changes since commit 2b6db9efa50799fa75ce609f24b355f29504bd9a:
Merge branch 'thermal-core' into thermal (2023-03-08 14:03:56 +0100)
are available in the Git repository at:
ssh://[email protected]/pub/scm/linux/kernel/git/thermal/linux.git
tags/thermal-v6.4-rc1-1
for you to fetch changes up to 0c492be4002b7411a1587b429e68e0cf3f562488:
thermal/drivers/ti: Use fixed update interval (2023-04-01 20:51:45 +0200)
----------------------------------------------------------------
- Add more thermal zone device encapsulation: prevent setting
structure field directly, access the sensor device instead the
thermal zone's device for trace, relocate the traces in
drivers/thermal (Daniel Lezcano)
- Use the generic trip point for the i.MX and remove the get_trip_temp
ops (Daniel Lezcano)
- Use the devm_platform_ioremap_resource() in the Hisilicon driver
(Yang Li)
- Remove R-Car H3 ES1.* handling as public has only access to the ES2
version and the upstream support for the ES1 has been shutdown
(Wolfram Sang)
- Add a delay after initializing the bank in order to let the time to
the hardware to initialze itself before reading the temperature
(Amjad Ouled-Ameur)
- Add MT8365 support (Amjad Ouled-Ameur)
----------------------------------------------------------------
Amjad Ouled-Ameur (1):
thermal/drivers/mediatek: Add delay after thermal banks
initialization
Daniel Lezcano (6):
thermal/drivers/imx: Remove get_trip_temp ops
thermal/drivers/imx: Use the thermal framework for the trip point
thermal/core: Relocate the traces definition in thermal directory
thermal/drivers/db8500: Use driver dev instead of tz->device
thermal/drivers/stm: Don't set no_hwmon to false
thermal/drivers/ti: Use fixed update interval
Fabien Parent (2):
dt-bindings: thermal: mediatek: Add binding documentation for
MT8365 SoC
thermal/drivers/mediatek: Add support for MT8365 SoC
Markus Schneider-Pargmann (1):
thermal/drivers/mediatek: Control buffer enablement tweaks
Wolfram Sang (1):
thermal/drivers/rcar_gen3_thermal: Remove R-Car H3 ES1.* handling
Yang Li (1):
thermal/drivers/hisi: Use devm_platform_ioremap_resource()
.../bindings/thermal/mediatek-thermal.txt | 1 +
drivers/thermal/Makefile | 3 +-
drivers/thermal/cpufreq_cooling.c | 2 +-
drivers/thermal/db8500_thermal.c | 7 +-
drivers/thermal/devfreq_cooling.c | 2 +-
drivers/thermal/gov_fair_share.c | 2 +-
drivers/thermal/gov_power_allocator.c | 2 +-
drivers/thermal/gov_step_wise.c | 2 +-
drivers/thermal/hisi_thermal.c | 4 +-
drivers/thermal/imx_thermal.c | 19 ++--
drivers/thermal/mediatek/auxadc_thermal.c | 107
+++++++++++++++++----
drivers/thermal/rcar_gen3_thermal.c | 52 +---------
drivers/thermal/st/stm_thermal.c | 1 -
drivers/thermal/thermal_core.c | 2 +-
drivers/thermal/thermal_helpers.c | 3 +-
.../thermal.h => drivers/thermal/thermal_trace.h | 6 ++
.../thermal/thermal_trace_ipa.h | 6 ++
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 8 +-
18 files changed, 131 insertions(+), 98 deletions(-)
rename include/trace/events/thermal.h =>
drivers/thermal/thermal_trace.h (97%)
rename include/trace/events/thermal_power_allocator.h =>
drivers/thermal/thermal_trace_ipa.h (96%)
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Hi Rafael,
just a gentle reminder because more material will come in the next days
Thanks
-- Daniel
On 01/04/2023 21:04, Daniel Lezcano wrote:
> The following changes since commit
> 2b6db9efa50799fa75ce609f24b355f29504bd9a:
>
> Merge branch 'thermal-core' into thermal (2023-03-08 14:03:56 +0100)
>
> are available in the Git repository at:
>
>
> ssh://[email protected]/pub/scm/linux/kernel/git/thermal/linux.git
> tags/thermal-v6.4-rc1-1
>
> for you to fetch changes up to 0c492be4002b7411a1587b429e68e0cf3f562488:
>
> thermal/drivers/ti: Use fixed update interval (2023-04-01 20:51:45
> +0200)
>
> ----------------------------------------------------------------
> - Add more thermal zone device encapsulation: prevent setting
> structure field directly, access the sensor device instead the
> thermal zone's device for trace, relocate the traces in
> drivers/thermal (Daniel Lezcano)
>
> - Use the generic trip point for the i.MX and remove the get_trip_temp
> ops (Daniel Lezcano)
>
> - Use the devm_platform_ioremap_resource() in the Hisilicon driver
> (Yang Li)
>
> - Remove R-Car H3 ES1.* handling as public has only access to the ES2
> version and the upstream support for the ES1 has been shutdown
> (Wolfram Sang)
>
> - Add a delay after initializing the bank in order to let the time to
> the hardware to initialze itself before reading the temperature
> (Amjad Ouled-Ameur)
>
> - Add MT8365 support (Amjad Ouled-Ameur)
>
> ----------------------------------------------------------------
> Amjad Ouled-Ameur (1):
> thermal/drivers/mediatek: Add delay after thermal banks
> initialization
>
> Daniel Lezcano (6):
> thermal/drivers/imx: Remove get_trip_temp ops
> thermal/drivers/imx: Use the thermal framework for the trip point
> thermal/core: Relocate the traces definition in thermal directory
> thermal/drivers/db8500: Use driver dev instead of tz->device
> thermal/drivers/stm: Don't set no_hwmon to false
> thermal/drivers/ti: Use fixed update interval
>
> Fabien Parent (2):
> dt-bindings: thermal: mediatek: Add binding documentation for
> MT8365 SoC
> thermal/drivers/mediatek: Add support for MT8365 SoC
>
> Markus Schneider-Pargmann (1):
> thermal/drivers/mediatek: Control buffer enablement tweaks
>
> Wolfram Sang (1):
> thermal/drivers/rcar_gen3_thermal: Remove R-Car H3 ES1.* handling
>
> Yang Li (1):
> thermal/drivers/hisi: Use devm_platform_ioremap_resource()
>
> .../bindings/thermal/mediatek-thermal.txt | 1 +
> drivers/thermal/Makefile | 3 +-
> drivers/thermal/cpufreq_cooling.c | 2 +-
> drivers/thermal/db8500_thermal.c | 7 +-
> drivers/thermal/devfreq_cooling.c | 2 +-
> drivers/thermal/gov_fair_share.c | 2 +-
> drivers/thermal/gov_power_allocator.c | 2 +-
> drivers/thermal/gov_step_wise.c | 2 +-
> drivers/thermal/hisi_thermal.c | 4 +-
> drivers/thermal/imx_thermal.c | 19 ++--
> drivers/thermal/mediatek/auxadc_thermal.c | 107
> +++++++++++++++++----
> drivers/thermal/rcar_gen3_thermal.c | 52 +---------
> drivers/thermal/st/stm_thermal.c | 1 -
> drivers/thermal/thermal_core.c | 2 +-
> drivers/thermal/thermal_helpers.c | 3 +-
> .../thermal.h => drivers/thermal/thermal_trace.h | 6 ++
> .../thermal/thermal_trace_ipa.h | 6 ++
> drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 8 +-
> 18 files changed, 131 insertions(+), 98 deletions(-)
> rename include/trace/events/thermal.h =>
> drivers/thermal/thermal_trace.h (97%)
> rename include/trace/events/thermal_power_allocator.h =>
> drivers/thermal/thermal_trace_ipa.h (96%)
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On Wed, Apr 5, 2023 at 8:39 PM Rafael J. Wysocki <[email protected]> wrote:
>
> On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano <[email protected]> wrote:
> >
> >
> > Hi Rafael,
> >
> > just a gentle reminder
>
> This is in my linux-next branch, I'll merge it into thermal tomorrow.
>
> > because more material will come in the next days
>
> So why can't it wait?
BTW, I get a merge conflict in
drivers/thermal/mediatek/auxadc_thermal.c on an attempt to merge
thermal/linux-next into my linux-next branch.
On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano <[email protected]> wrote:
>
>
> Hi Rafael,
>
> just a gentle reminder
This is in my linux-next branch, I'll merge it into thermal tomorrow.
> because more material will come in the next days
So why can't it wait?
On 05/04/2023 20:39, Rafael J. Wysocki wrote:
> On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano <[email protected]> wrote:
>>
>>
>> Hi Rafael,
>>
>> just a gentle reminder
>
> This is in my linux-next branch, I'll merge it into thermal tomorrow.
>
>> because more material will come in the next days
>
> So why can't it wait?
There are more changes to be sent which is against thermal/bleeding-edge
+ patches on the mailing list
The branch thermal/bleeding-edge is based on thermal/linux-next which in
turn is based on linux-pm/next
Having thermal/linux-next merged will allow me to merge
thermal/bleeding-edge into thermal/linux-next, then take the patches on
the mailing list and merge them into thermal/bleeding-edge.
So at this point, I can send more patches based on the exported branch.
Otherwise, the patches I will send will depend on patches on the mailing
list.
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On Wed, Apr 5, 2023 at 9:03 PM Daniel Lezcano <[email protected]> wrote:
>
> On 05/04/2023 20:48, Rafael J. Wysocki wrote:
> > On Wed, Apr 5, 2023 at 8:39 PM Rafael J. Wysocki <[email protected]> wrote:
> >>
> >> On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano <[email protected]> wrote:
> >>>
> >>>
> >>> Hi Rafael,
> >>>
> >>> just a gentle reminder
> >>
> >> This is in my linux-next branch, I'll merge it into thermal tomorrow.
> >>
> >>> because more material will come in the next days
> >>
> >> So why can't it wait?
> >
> > BTW, I get a merge conflict in
> > drivers/thermal/mediatek/auxadc_thermal.c on an attempt to merge
> > thermal/linux-next into my linux-next branch.
>
> Ah?
>
> I did an update and rebased thermal/linux-next on top of
> linux-pm/thermal without conflict
>
> Is it possible you have a change in a different branch conflicting with it ?
It is not impossible, but quite unlikely.
I'll see what's going on tomorrow.
On 05/04/2023 20:48, Rafael J. Wysocki wrote:
> On Wed, Apr 5, 2023 at 8:39 PM Rafael J. Wysocki <[email protected]> wrote:
>>
>> On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano <[email protected]> wrote:
>>>
>>>
>>> Hi Rafael,
>>>
>>> just a gentle reminder
>>
>> This is in my linux-next branch, I'll merge it into thermal tomorrow.
>>
>>> because more material will come in the next days
>>
>> So why can't it wait?
>
> BTW, I get a merge conflict in
> drivers/thermal/mediatek/auxadc_thermal.c on an attempt to merge
> thermal/linux-next into my linux-next branch.
Ah?
I did an update and rebased thermal/linux-next on top of
linux-pm/thermal without conflict
Is it possible you have a change in a different branch conflicting with it ?
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On Wed, Apr 5, 2023 at 9:06 PM Rafael J. Wysocki <[email protected]> wrote:
>
> On Wed, Apr 5, 2023 at 9:03 PM Daniel Lezcano <[email protected]> wrote:
> >
> > On 05/04/2023 20:48, Rafael J. Wysocki wrote:
> > > On Wed, Apr 5, 2023 at 8:39 PM Rafael J. Wysocki <[email protected]> wrote:
> > >>
> > >> On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano <[email protected]> wrote:
> > >>>
> > >>>
> > >>> Hi Rafael,
> > >>>
> > >>> just a gentle reminder
> > >>
> > >> This is in my linux-next branch, I'll merge it into thermal tomorrow.
> > >>
> > >>> because more material will come in the next days
> > >>
> > >> So why can't it wait?
> > >
> > > BTW, I get a merge conflict in
> > > drivers/thermal/mediatek/auxadc_thermal.c on an attempt to merge
> > > thermal/linux-next into my linux-next branch.
> >
> > Ah?
> >
> > I did an update and rebased thermal/linux-next on top of
> > linux-pm/thermal without conflict
> >
> > Is it possible you have a change in a different branch conflicting with it ?
>
> It is not impossible, but quite unlikely.
>
> I'll see what's going on tomorrow.
Confirmed, thermal/linux-next merges on top of the current
linux-pm/thermal (just pushed out) without conflicts.
There is a conflict between linux-pm/bleeding-edge and
thermal/bleeding-edge, but it's easy to resolve.
Thanks!