Hi Rafael,
The following changes since commit 61b7614c114c817f9f326282c2f7a728bf0051a8:
Merge branch 'thermal-intel' into linux-next (2023-02-09 19:57:59 +0100)
are available in the Git repository at:
ssh://[email protected]/pub/scm/linux/kernel/git/thermal/linux.git
tags/thermal-v6.3-rc1-2
for you to fetch changes up to f8da73d02bfcf6d61513912035150d91c14ea1e9:
thermal/drivers/st: Remove syscfg based driver (2023-02-13 11:42:35
+0100)
----------------------------------------------------------------
- Fix missing thermal_sampling_exit() call when unsubscribing (Vincent
Guittot)
- Add the LVTS Mediatek driver along with a relocation to the Mediatek
folder (Balsam Chihi)
- Add the r8a779g0 RCar support (Geert Uytterhoeven)
- Fix useless call to set_trips() when resuming and add interrupt
support detection at init time on RCar gen3 (Niklas Söderlund)
- Fix memory corruption in the hi3660 thermal driver (Yongqin Liu)
- Fix include path for libnl3 in pkg-config file for the libthermal
(Vibhav Pant)
- Remove core header inclusion from drivers (Daniel Lezcano)
- Remove syscfg based driver as the platform is removed (Alain Volmat)
----------------------------------------------------------------
Alain Volmat (1):
thermal/drivers/st: Remove syscfg based driver
Balsam CHIHI (3):
thermal/drivers/mediatek: Relocate driver to mediatek folder
dt-bindings: thermal: mediatek: Add LVTS thermal controllers
thermal/drivers/mediatek: Add the Low Voltage Thermal Sensor driver
Daniel Lezcano (1):
thermal: Remove core header inclusion from drivers
Geert Uytterhoeven (2):
dt-bindings: thermal: rcar-gen3-thermal: Add r8a779g0 support
thermal/drivers/rcar_gen3: Add support for R-Car V4H
Niklas Söderlund (3):
thermal/drivers/rcar_gen3_thermal: Do not call set_trips() when
resuming
thermal/drivers/rcar_gen3_thermal: Create device local ops struct
thermal/drivers/rcar_gen3_thermal: Fix device initialization
Vibhav Pant (1):
tools/lib/thermal: Fix include path for libnl3 in pkg-config file.
Vincent Guittot (1):
tools/lib/thermal: Fix thermal_sampling_exit()
Yongqin Liu (1):
thermal/drivers/hisi: Drop second sensor hi3660
.../bindings/thermal/mediatek,lvts-thermal.yaml | 142 +++
.../bindings/thermal/rcar-gen3-thermal.yaml | 3 +
drivers/thermal/Kconfig | 14 +-
drivers/thermal/Makefile | 2 +-
drivers/thermal/amlogic_thermal.c | 1 -
drivers/thermal/armada_thermal.c | 2 -
drivers/thermal/broadcom/bcm2835_thermal.c | 1 -
drivers/thermal/hisi_thermal.c | 7 +-
drivers/thermal/imx8mm_thermal.c | 1 -
drivers/thermal/imx_sc_thermal.c | 1 -
drivers/thermal/intel/intel_hfi.c | 3 +-
drivers/thermal/mediatek/Kconfig | 37 +
drivers/thermal/mediatek/Makefile | 2 +
.../{mtk_thermal.c => mediatek/auxadc_thermal.c} | 2 +-
drivers/thermal/mediatek/lvts_thermal.c | 1224
++++++++++++++++++++
drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 1 -
drivers/thermal/qoriq_thermal.c | 1 -
drivers/thermal/rcar_gen3_thermal.c | 41 +-
drivers/thermal/samsung/exynos_tmu.c | 3 +-
drivers/thermal/st/Kconfig | 4 -
drivers/thermal/st/Makefile | 1 -
drivers/thermal/st/st_thermal_syscfg.c | 174 ---
drivers/thermal/st/stm_thermal.c | 1 -
drivers/thermal/tegra/tegra30-tsensor.c | 1 -
drivers/thermal/uniphier_thermal.c | 2 -
.../dt-bindings/thermal/mediatek,lvts-thermal.h | 19 +
tools/lib/thermal/libthermal.pc.template | 2 +-
tools/lib/thermal/sampling.c | 2 +-
28 files changed, 1461 insertions(+), 233 deletions(-)
create mode 100644
Documentation/devicetree/bindings/thermal/mediatek,lvts-thermal.yaml
create mode 100644 drivers/thermal/mediatek/Kconfig
create mode 100644 drivers/thermal/mediatek/Makefile
rename drivers/thermal/{mtk_thermal.c => mediatek/auxadc_thermal.c} (99%)
create mode 100644 drivers/thermal/mediatek/lvts_thermal.c
delete mode 100644 drivers/thermal/st/st_thermal_syscfg.c
create mode 100644 include/dt-bindings/thermal/mediatek,lvts-thermal.h
On Mon, Feb 13, 2023 at 12:10 PM Daniel Lezcano
<[email protected]> wrote:
>
> Hi Rafael,
>
> The following changes since commit 61b7614c114c817f9f326282c2f7a728bf0051a8:
>
> Merge branch 'thermal-intel' into linux-next (2023-02-09 19:57:59 +0100)
>
> are available in the Git repository at:
>
>
> ssh://[email protected]/pub/scm/linux/kernel/git/thermal/linux.git
> tags/thermal-v6.3-rc1-2
>
> for you to fetch changes up to f8da73d02bfcf6d61513912035150d91c14ea1e9:
>
> thermal/drivers/st: Remove syscfg based driver (2023-02-13 11:42:35
> +0100)
>
> ----------------------------------------------------------------
> - Fix missing thermal_sampling_exit() call when unsubscribing (Vincent
> Guittot)
>
> - Add the LVTS Mediatek driver along with a relocation to the Mediatek
> folder (Balsam Chihi)
>
> - Add the r8a779g0 RCar support (Geert Uytterhoeven)
>
> - Fix useless call to set_trips() when resuming and add interrupt
> support detection at init time on RCar gen3 (Niklas Söderlund)
>
> - Fix memory corruption in the hi3660 thermal driver (Yongqin Liu)
>
> - Fix include path for libnl3 in pkg-config file for the libthermal
> (Vibhav Pant)
>
> - Remove core header inclusion from drivers (Daniel Lezcano)
>
> - Remove syscfg based driver as the platform is removed (Alain Volmat)
>
> ----------------------------------------------------------------
> Alain Volmat (1):
> thermal/drivers/st: Remove syscfg based driver
>
> Balsam CHIHI (3):
> thermal/drivers/mediatek: Relocate driver to mediatek folder
> dt-bindings: thermal: mediatek: Add LVTS thermal controllers
> thermal/drivers/mediatek: Add the Low Voltage Thermal Sensor driver
>
> Daniel Lezcano (1):
> thermal: Remove core header inclusion from drivers
>
> Geert Uytterhoeven (2):
> dt-bindings: thermal: rcar-gen3-thermal: Add r8a779g0 support
> thermal/drivers/rcar_gen3: Add support for R-Car V4H
>
> Niklas Söderlund (3):
> thermal/drivers/rcar_gen3_thermal: Do not call set_trips() when
> resuming
> thermal/drivers/rcar_gen3_thermal: Create device local ops struct
> thermal/drivers/rcar_gen3_thermal: Fix device initialization
>
> Vibhav Pant (1):
> tools/lib/thermal: Fix include path for libnl3 in pkg-config file.
>
> Vincent Guittot (1):
> tools/lib/thermal: Fix thermal_sampling_exit()
>
> Yongqin Liu (1):
> thermal/drivers/hisi: Drop second sensor hi3660
Pulled and pushed out, thanks!
Hi Daniel,
On Mon, Feb 13, 2023 at 12:10 PM Daniel Lezcano
<[email protected]> wrote:
>
> Hi Rafael,
>
> The following changes since commit 61b7614c114c817f9f326282c2f7a728bf0051a8:
>
> Merge branch 'thermal-intel' into linux-next (2023-02-09 19:57:59 +0100)
When I was preparing my thermal pull request for 6.3-rc1 which I'm
going to submit shortly, I noticed that this pull request was based on
my linux-next branch which wasn't suitable for this purpose at all (it
contained temporary merges and material that is not sent in thermal
pull requests, like ACPI and power management commits).
In the future, if I receive a pull request based on my linux-next
branch, I won't pull.
Please base your pull requests sent to me on mainline commits
(ideally, on a recent -rc) or, if there are commits that your new
material depends on in my thermal branch, you can base your pull
request on it (it is a forward-only branch as a rule, but please see
below). If none of the above is applicable, please let me know ahead
of time, so I can set up a separate forward-only branch as a base for
your pull request.
This time I had to reset my thermal branch back to commit
f364beb5b673, merge my thermal-core and thermal-intel branches and
cherry-pick the new thermal changes from the $subject pull request on
top of that to remedy the situation (I have verified that this has not
introduced any code differences).
Thanks,
Rafael